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

diff --git a/src/graph.c b/src/graph.c
index fdbf713..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,12 +653,14 @@ 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 (const graph_config_t *cfg, /* {{{ */
+int graph_def_to_json (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
     yajl_gen handler)
 {
 #define yajl_gen_string_cast(h,p,l) \
@@ -662,15 +673,32 @@ int graph_def_to_json (const graph_config_t *cfg, /* {{{ */
 
   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));
+  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"));
-  def_to_json (cfg->defs, handler);
+  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);