diff --git a/src/graph_def.c b/src/graph_def.c
index 9aba1ce133371e25d27f54248079d99d35d28d90..d01db8ea8b4e06e581705a74668273e89491887f 100644 (file)
--- a/src/graph_def.c
+++ b/src/graph_def.c
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);
+
+ if (def->color < 0x00ffffff)
+ snprintf (color, sizeof (color), "#%06"PRIx32, def->color);
+ else
+ strncpy (color, "random", sizeof (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);
+ if (def->ds_name != NULL)
+ {
+ yajl_gen_string_cast (handler, "ds_name", strlen ("ds_name"));
+ yajl_gen_string_cast (handler, def->ds_name, strlen (def->ds_name));
+ }
+ if (def->legend != NULL)
+ {
+ 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);
+ if (def->format != NULL)
+ {
+ 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
*/
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);
}
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);
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);
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 : */