X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=action_list_graphs.c;h=c239222051679003587bbcf769d407d9b2abd4df;hb=0bdac0286e8d3c42dd8d5c3058d822e9ad0e6313;hp=9fc8f45a5079207721a1084fb569c1b6073c7b29;hpb=7549e5e9405595cc9069faa86478de3a65a61ce2;p=collection4.git

diff --git a/action_list_graphs.c b/action_list_graphs.c
index 9fc8f45..c239222 100644
--- a/action_list_graphs.c
+++ b/action_list_graphs.c
@@ -6,6 +6,7 @@
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
 
+#include "action_list_graphs.h"
 #include "graph_list.h"
 #include "utils_params.h"
 
@@ -42,22 +43,34 @@ static int print_graph_json (const graph_list_t *gl, void *user_data) /* {{{ */
   return (0);
 } /* }}} int print_graph_json */
 
-static int print_graph_html (const graph_list_t *gl,
-    void __attribute__((unused)) *user_data)
+static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
+    __attribute__((unused)) void *user_data)
 {
-  if (gl == NULL)
-    return (EINVAL);
+  char buffer[1024];
 
-  printf ("<li>%s/%s", gl->host, gl->plugin);
-  if (gl->plugin_instance != NULL)
-    printf ("-%s", gl->plugin_instance);
-  printf ("/%s", gl->type);
-  if (gl->type_instance != NULL)
-    printf ("-%s", gl->type_instance);
-  printf ("</li>\n");
+  memset (buffer, 0, sizeof (buffer));
+  gl_instance_get_params (cfg, inst, buffer, sizeof (buffer));
+
+  printf ("<li><a href=\"test.fcgi?action=graph;%s\">%s</a></li>\n", buffer, buffer);
+
+  return (0);
+} /* }}} int print_graph_inst_html */
+
+static int print_graph_html (graph_config_t *cfg, /* {{{ */
+    __attribute__((unused)) void *user_data)
+{
+  char buffer[1024];
+
+  memset (buffer, 0, sizeof (buffer));
+  gl_graph_get_title (cfg, buffer, sizeof (buffer));
+
+  printf ("<li>%s\n<ul>\n", buffer);
+  gl_graph_instance_get_all (cfg, print_graph_inst_html, /* user_data = */ NULL);
+  printf ("</ul>\n");
 
   return (0);
-}
+} /* }}} int print_graph_html */
 
 static int list_graphs_json (void) /* {{{ */
 {
@@ -77,7 +90,7 @@ static int list_graphs_html (void) /* {{{ */
   printf ("Content-Type: text/html\n\n");
 
   printf ("<ul>\n");
-  gl_foreach (print_graph_html, /* user_data = */ NULL);
+  gl_graph_get_all (print_graph_html, /* user_data = */ NULL);
   printf ("</ul>\n");
 
   return (0);