X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.c;h=713d45f92c2b8c984da9ec309bbdd832e0904697;hb=3fbe261b1de541590f5d3be1bef49b3b3605f392;hp=fdbf71357fd91c274e9a5c883b1cfc8dd996d431;hpb=6b69fb3290de5d4208dc751f2fdbf8a37212fed8;p=collection4.git

diff --git a/src/graph.c b/src/graph.c
index fdbf713..713d45f 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -649,7 +649,8 @@ int graph_to_json (const graph_config_t *cfg, /* {{{ */
   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 +663,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);