src/graph_def.c: Minor fixes.

[collection4.git] / src / graph_def.c

diff --git a/src/graph_def.c b/src/graph_def.c
index 9aba1ce..c7ecb98 100644 (file)
--- a/src/graph_def.c
+++ b/src/graph_def.c
@@ -148,6 +148,43 @@ static graph_def_t *def_config_get_obj (graph_config_t *cfg, /* {{{ */
   return (def);
 } /* }}} graph_def_t *def_config_get_obj */
 
+static int def_to_json_recursive (const graph_def_t *def, /* {{{ */
+    yajl_gen handler)
+{
+  char color[16];
+
+  if (def == NULL)
+    return (0);
+
+  snprintf (color, sizeof (color), "#%06"PRIx32, def->color);
+  color[sizeof (color) - 1] = 0;
+
+  yajl_gen_map_open (handler);
+
+#define yajl_gen_string_cast(h,p,l) \
+  yajl_gen_string (h, (unsigned char *) p, (unsigned int) l)
+
+  yajl_gen_string_cast (handler, "select", strlen ("select"));
+  ident_to_json (def->select, handler);
+  yajl_gen_string_cast (handler, "ds_name", strlen ("ds_name"));
+  yajl_gen_string_cast (handler, def->ds_name, strlen (def->ds_name));
+  yajl_gen_string_cast (handler, "legend", strlen ("legend"));
+  yajl_gen_string_cast (handler, def->legend, strlen (def->legend));
+  yajl_gen_string_cast (handler, "color", strlen ("color"));
+  yajl_gen_string_cast (handler, color, strlen (color));
+  yajl_gen_string_cast (handler, "stack", strlen ("stack"));
+  yajl_gen_bool   (handler, def->stack);
+  yajl_gen_string_cast (handler, "area", strlen ("area"));
+  yajl_gen_bool   (handler, def->area);
+  yajl_gen_string_cast (handler, "format", strlen ("format"));
+  yajl_gen_string_cast (handler, def->format, strlen (def->format));
+
+  yajl_gen_map_close (handler);
+
+  return (def_to_json_recursive (def->next, handler));
+#undef yajl_gen_string_cast
+} /* }}} int def_to_json_recursive */
+
 /*
  * Public functions
  */
@@ -158,15 +195,22 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
   graph_def_t *ret;
 
   if ((cfg == NULL) || (ident == NULL) || (ds_name == NULL))
+  {
+    fprintf (stderr, "def_create: An argument is NULL\n");
     return (NULL);
+  }
 
   selector = graph_get_selector (cfg);
   if (selector == NULL)
+  {
+    fprintf (stderr, "def_create: graph_get_selector failed\n");
     return (NULL);
+  }
 
   ret = malloc (sizeof (*ret));
   if (ret == NULL)
   {
+    fprintf (stderr, "def_create: malloc failed\n");
     ident_destroy (selector);
     return (NULL);
   }
@@ -177,6 +221,7 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
   ret->ds_name = strdup (ds_name);
   if (ret->ds_name == NULL)
   {
+    fprintf (stderr, "def_create: Unable to copy DS name\n");
     ident_destroy (selector);
     free (ret);
     return (NULL);
@@ -186,9 +231,10 @@ graph_def_t *def_create (graph_config_t *cfg, graph_ident_t *ident, /* {{{ */
   ret->next = NULL;
 
   ret->select = ident_copy_with_selector (selector, ident,
-      IDENT_FLAG_REPLACE_ANY);
+      IDENT_FLAG_REPLACE_ALL);
   if (ret->select == NULL)
   {
+    fprintf (stderr, "def_create: ident_copy_with_selector failed\n");
     ident_destroy (selector);
     free (ret->ds_name);
     free (ret);
@@ -412,4 +458,17 @@ int def_get_rrdargs (graph_def_t *def, graph_ident_t *ident, /* {{{ */
   return (0);
 } /* }}} int def_get_rrdargs */
 
+int def_to_json (const graph_def_t *def, /* {{{ */
+    yajl_gen handler)
+{
+  if (handler == NULL)
+    return (EINVAL);
+
+  yajl_gen_array_open (handler);
+  def_to_json_recursive (def, handler);
+  yajl_gen_array_close (handler);
+
+  return (0);
+} /* }}} int def_to_json */
+
 /* vim: set sw=2 sts=2 et fdm=marker : */