X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgraph.c;h=544a606d80cf06b1d2d728650e5cde56e6cf74ed;hb=HEAD;hp=ad47e46faed2ec173b1d59637a483581e58ed7c5;hpb=49e41ab84a7719050ada26760b0184180f085b55;p=collection4.git

diff --git a/src/graph.c b/src/graph.c
index ad47e46..544a606 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -633,10 +633,19 @@ int graph_to_json (const graph_config_t *cfg, /* {{{ */
     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"));
@@ -644,11 +653,59 @@ int graph_to_json (const graph_config_t *cfg, /* {{{ */
   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) /* {{{ */
 {
   return (inst_compare (*(graph_instance_t * const *) v0,