props: switched input args over to JSON

3 files changed, 13 insertions, 12 deletions

diff --git a/query/__init__.py b/query/__init__.py
index c72222b..dc3339c 100644
--- a/query/__init__.py
+++ b/query/__init__.py
@@ -35,16 +35,10 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 arg_strs = dict((str(k), str(v)) for k, v in args.iteritems())
                 s.wfile.write(json.dumps(arg_strs))
             else:
-                #why the fuck does no OS ever patch boost when there is a bug
-                #https://svn.boost.org/trac/boost/ticket/6785
-                #serialize the path args into xml -- but I just wanted json
-                def xml_from_qs(k, v):
-                    if not isinstance(v, list): v = [v]
-                    return ''.join(['<%s>%s</%s>'%(k, v_i, k) for v_i in v])
-                query_args = [xml_from_qs(k,v) for k,v in urlparse.parse_qs(o.query).iteritems()]
-                query_args.append(xml_from_qs('path', path))
-                xml_args = xml_from_qs('args', ''.join(query_args))
-                s.wfile.write(args['top_block'].query(xml_args))
+                query_args = dict([(k,v) for k,v in urlparse.parse_qs(o.query).iteritems()])
+                query_args['path'] = path
+                json_args = json.dumps(query_args)
+                s.wfile.write(args['top_block'].query(json_args))
             return
 
         #clean up path for filesystem
diff --git a/query/chart_factory.js b/query/chart_factory.js
index d55a8fd..f3e02a7 100644
--- a/query/chart_factory.js
+++ b/query/chart_factory.js
@@ -39,7 +39,14 @@ function gras_chart_factory_update(registry, point)
     registry.point = point; //store last data point
     $.each(registry.active_charts, function(index, chart_info)
     {
-        chart_info.chart.update(point);
+        try
+        {
+            chart_info.chart.update(point);
+        }
+        catch(err)
+        {
+            //jQuery.error("gras_chart_factory_update error: " + err.message);
+        }
     });
 }
 
diff --git a/query/main.js b/query/main.js
index 116653e..3b2fe31 100644
--- a/query/main.js
+++ b/query/main.js
@@ -33,7 +33,7 @@ var gras_query_stats = function(registry)
         url: "/stats.json",
         dataType: "json",
         traditional: true, //needed to parse data
-        data: {block:gras_chart_factory_active_blocks(registry)},
+        data: {blocks:gras_chart_factory_active_blocks(registry)},
         success: function(response)
         {
             registry.online = true;