share/collection.js: Made variable names more consistent.

[collection4.git] / src / action_list_graphs_json.c

diff --git a/src/action_list_graphs_json.c b/src/action_list_graphs_json.c
index 120e419..fa35949 100644 (file)
--- a/src/action_list_graphs_json.c
+++ b/src/action_list_graphs_json.c
@@ -44,9 +44,9 @@ static void write_callback (__attribute__((unused)) void *ctx, /* {{{ */
 static int print_one_graph (graph_config_t *cfg, /* {{{ */
     void *user_data)
 {
-  char params[1024];
   char title[1024];
   size_t num_instances;
+  graph_ident_t *selector;
 
   yajl_gen handler = user_data;
 
@@ -54,14 +54,18 @@ static int print_one_graph (graph_config_t *cfg, /* {{{ */
   if (num_instances < 1)
     return (0);
 
+  selector = graph_get_selector (cfg);
+  if (selector == NULL)
+  {
+    /* TODO: Print error. */
+    return (0);
+  }
+
   yajl_gen_map_open (handler);
 
   memset (title, 0, sizeof (title));
   graph_get_title (cfg, title, sizeof (title));
 
-  memset (params, 0, sizeof (params));
-  graph_get_params (cfg, params, sizeof (params));
-
   yajl_gen_string (handler,
       (unsigned char *) "title",
       (unsigned int) strlen ("title"));
@@ -70,11 +74,9 @@ static int print_one_graph (graph_config_t *cfg, /* {{{ */
       (unsigned int) strlen (title));
 
   yajl_gen_string (handler,
-      (unsigned char *) "params",
-      (unsigned int) strlen ("params"));
-  yajl_gen_string (handler,
-      (unsigned char *) params,
-      (unsigned int) strlen (params));
+      (unsigned char *) "select",
+      (unsigned int) strlen ("select"));
+  ident_to_json (selector, handler);
 
   yajl_gen_string (handler,
       (unsigned char *) "num_instances",
@@ -83,6 +85,8 @@ static int print_one_graph (graph_config_t *cfg, /* {{{ */
 
   yajl_gen_map_close (handler);
 
+  ident_destroy (selector);
+
   return (0);
 } /* }}} int print_one_graph */
 
@@ -108,8 +112,6 @@ static int print_all_graphs (yajl_gen handler) /* {{{ */
 
 int action_list_graphs_json (void) /* {{{ */
 {
-  graph_config_t *cfg;
-
   yajl_gen_config handler_config;
   yajl_gen handler;