diff --git a/src/graph.c b/src/graph.c
index b654a1f30e26edb3f8fa4983c028f23c9095d3a7..544a606d80cf06b1d2d728650e5cde56e6cf74ed 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
return (0);
} /* }}} graph_config_add */
+int graph_add_inst (graph_config_t *graph, graph_instance_t *inst) /* {{{ */
+{
+ graph_instance_t **tmp;
+
+ if ((graph == NULL) || (inst == NULL))
+ return (EINVAL);
+
+ tmp = realloc (graph->instances,
+ sizeof (*graph->instances) * (graph->instances_num + 1));
+ if (tmp == NULL)
+ return (ENOMEM);
+ graph->instances = tmp;
+
+ graph->instances[graph->instances_num] = inst;
+ graph->instances_num++;
+
+ return (0);
+} /* }}} int graph_add_inst */
+
int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
{
graph_instance_t *inst;
inst = graph_inst_find_matching (cfg, file);
if (inst == NULL)
{
- graph_instance_t **tmp;
-
- tmp = realloc (cfg->instances,
- sizeof (*cfg->instances) * (cfg->instances_num + 1));
- if (tmp == NULL)
- return (ENOMEM);
- cfg->instances = tmp;
-
inst = inst_create (cfg, file);
if (inst == NULL)
return (ENOMEM);
- cfg->instances[cfg->instances_num] = inst;
- cfg->instances_num++;
+ graph_add_inst (cfg, inst);
}
return (inst_add_file (inst, file));
return (cfg->instances_num);
} /* }}} size_t graph_num_instances */
-int graph_to_json (const graph_config_t *cfg,
+int graph_to_json (const graph_config_t *cfg, /* {{{ */
yajl_gen handler)
{
size_t i;
return (EINVAL);
yajl_gen_map_open (handler);
+
+ yajl_gen_string (handler,
+ (unsigned char *) "title",
+ (unsigned int) strlen ("title"));
+ yajl_gen_string (handler,
+ (unsigned char *) cfg->title,
+ (unsigned int) strlen (cfg->title));
+
yajl_gen_string (handler,
(unsigned char *) "select",
(unsigned int) strlen ("select"));
ident_to_json (cfg->select, handler);
+
yajl_gen_string (handler,
(unsigned char *) "instances",
(unsigned int) strlen ("instances"));
for (i = 0; i < cfg->instances_num; i++)
inst_to_json (cfg->instances[i], handler);
yajl_gen_array_close (handler);
+
+ yajl_gen_map_close (handler);
+
+ return (0);
+} /* }}} int graph_to_json */
+
+int graph_def_to_json (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ yajl_gen handler)
+{
+#define yajl_gen_string_cast(h,p,l) \
+ yajl_gen_string (h, (unsigned char *) p, (unsigned int) l)
+
+ if ((cfg == NULL) || (handler == NULL))
+ return (EINVAL);
+
+ yajl_gen_map_open (handler);
+
+ yajl_gen_string_cast (handler, "select", strlen ("select"));
+ ident_to_json (cfg->select, handler);
+ if (cfg->title != NULL)
+ {
+ yajl_gen_string_cast (handler, "title", strlen ("title"));
+ yajl_gen_string_cast (handler, cfg->title, strlen (cfg->title));
+ }
+ if (cfg->vertical_label != NULL)
+ {
+ yajl_gen_string_cast (handler, "vertical_label", strlen ("vertical_label"));
+ yajl_gen_string_cast (handler, cfg->vertical_label, strlen (cfg->vertical_label));
+ }
+ yajl_gen_string_cast (handler, "show_zero", strlen ("show_zero"));
+ yajl_gen_bool (handler, cfg->show_zero);
+
+ yajl_gen_string_cast (handler, "defs", strlen ("defs"));
+ if (cfg->defs == NULL)
+ {
+ graph_def_t *defs;
+
+ defs = inst_get_default_defs (cfg, inst);
+ def_to_json (defs, handler);
+ def_destroy (defs);
+ }
+ else
+ {
+ def_to_json (cfg->defs, handler);
+ }
+
yajl_gen_map_close (handler);
return (0);
-}
+#undef yajl_gen_string_cast
+} /* }}} int graph_def_to_json */
static int graph_sort_instances_cb (const void *v0, const void *v1) /* {{{ */
{