X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph.c;h=fdbf71357fd91c274e9a5c883b1cfc8dd996d431;hp=f664be1367adacda63196ff4d511006fabe48b5e;hb=c4c851ce35ad88eff7f843dbced132f55b8a2f6c;hpb=c60546477991d9a881e51dd05ee4fadc38dc6bc1

diff --git a/src/graph.c b/src/graph.c
index f664be1..fdbf713 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -188,6 +188,25 @@ int graph_config_add (const oconfig_item_t *ci) /* {{{ */
   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;
@@ -195,20 +214,11 @@ int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
   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));
@@ -614,7 +624,7 @@ size_t graph_num_instances (graph_config_t *cfg) /* {{{ */
   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;
@@ -627,6 +637,9 @@ int graph_to_json (const graph_config_t *cfg,
       (unsigned char *) "select",
       (unsigned int) strlen ("select"));
   ident_to_json (cfg->select, handler);
+  yajl_gen_string (handler,
+      (unsigned char *) "instances",
+      (unsigned int) strlen ("instances"));
   yajl_gen_array_open (handler);
   for (i = 0; i < cfg->instances_num; i++)
     inst_to_json (cfg->instances[i], handler);
@@ -634,7 +647,36 @@ int graph_to_json (const graph_config_t *cfg,
   yajl_gen_map_close (handler);
 
   return (0);
-}
+} /* }}} int graph_to_json */
+
+int graph_def_to_json (const graph_config_t *cfg, /* {{{ */
+    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);
+  yajl_gen_string_cast (handler, "title", strlen ("title"));
+  yajl_gen_string_cast (handler, cfg->title, strlen (cfg->title));
+  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"));
+  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) /* {{{ */
 {