X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=action_list_graphs.c;h=0663b98dbbcfd6f1aad2bd06fc8cf423a0e31e77;hb=d939c6f2f4f5e7e09831f2a3e9421ccd09727d3e;hp=c239222051679003587bbcf769d407d9b2abd4df;hpb=8f210aa3a93bafab43eba645c9bc2babab999b93;p=collection4.git

diff --git a/action_list_graphs.c b/action_list_graphs.c
index c239222..0663b98 100644
--- a/action_list_graphs.c
+++ b/action_list_graphs.c
@@ -3,46 +3,64 @@
 #include <string.h>
 #include <errno.h>
 
-#include <fcgiapp.h>
-#include <fcgi_stdio.h>
-
 #include "action_list_graphs.h"
 #include "graph_list.h"
 #include "utils_params.h"
 
-static int print_graph_json (const graph_list_t *gl, void *user_data) /* {{{ */
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
+static int print_graph_inst_json (__attribute__((unused)) graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
+    void *user_data)
 {
   _Bool *first;
+  graph_ident_t *ident;
+  char *json;
 
-  if ((gl == NULL) || (user_data == NULL))
-    return (EINVAL);
+  first = user_data;
 
-  first = (_Bool *) user_data;
-  if (!*first)
-    printf (",\n");
-  *first = 0;
+  ident = gl_instance_get_selector (inst);
+  if (ident == NULL)
+    return (-1);
 
-  printf (" {");
-
-  printf ("\"host\":\"%s\"", gl->host);
-      
-  printf (",\"plugin\":\"%s\"", gl->plugin);
-  if (gl->plugin_instance != NULL)
-    printf (",\"plugin_instance\":\"%s\"", gl->plugin_instance);
-  else
-    printf (",\"plugin_instance\":null");
+  json = ident_to_json (ident);
+  if (json == NULL)
+  {
+    ident_destroy (ident);
+    return (ENOMEM);
+  }
 
-  printf (",\"type\":\"%s\"", gl->type);
-  if (gl->type_instance != NULL)
-    printf (",\"type_instance\":\"%s\"", gl->type_instance);
+  if (*first)
+    printf ("%s", json);
   else
-    printf (",\"type_instance\":null");
+    printf (",\n%s", json);
 
-  printf ("}");
+  *first = 0;
 
+  ident_destroy (ident);
   return (0);
+} /* }}} int print_graph_inst_json */
+
+static int print_graph_json (graph_config_t *cfg, /* {{{ */
+    void *user_data)
+{
+  return (gl_graph_instance_get_all (cfg, print_graph_inst_json, user_data));
 } /* }}} int print_graph_json */
 
+static int list_graphs_json (void) /* {{{ */
+{
+  _Bool first = 1;
+
+  printf ("Content-Type: application/json\n\n");
+
+  printf ("[\n");
+  gl_graph_get_all (print_graph_json, /* user_data = */ &first);
+  printf ("\n]");
+
+  return (0);
+} /* }}} int list_graphs_json */
+
 static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
     graph_instance_t *inst,
     __attribute__((unused)) void *user_data)
@@ -72,19 +90,6 @@ static int print_graph_html (graph_config_t *cfg, /* {{{ */
   return (0);
 } /* }}} int print_graph_html */
 
-static int list_graphs_json (void) /* {{{ */
-{
-  _Bool first = 1;
-
-  printf ("Content-Type: application/json\n\n");
-
-  printf ("[\n");
-  gl_foreach (print_graph_json, /* user_data = */ &first);
-  printf ("\n]");
-
-  return (0);
-} /* }}} int list_graphs_json */
-
 static int list_graphs_html (void) /* {{{ */
 {
   printf ("Content-Type: text/html\n\n");