src/graph_instance.[ch]: Implement "inst_ident_matches" in addition to "inst_matches_...

[collection4.git] / src / action_list_graphs.c

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index e32b999..ff78482 100644 (file)
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -7,6 +7,7 @@
 #include "common.h"
 #include "graph.h"
 #include "graph_ident.h"
+#include "graph_instance.h"
 #include "graph_list.h"
 #include "utils_cgi.h"
 
@@ -111,7 +112,26 @@ static int print_search_result (void *user_data) /* {{{ */
   else
   {
     char *term_lc = strtolower_copy (pg_data->search_term);
-    gl_search (term_lc, print_graph_inst_html, /* user_data = */ &cb_data);
+
+    if (strncmp ("host:", term_lc, strlen ("host:")) == 0)
+      gl_search_field (GIF_HOST, term_lc + strlen ("host:"),
+          print_graph_inst_html, /* user_data = */ &cb_data);
+    else if (strncmp ("plugin:", term_lc, strlen ("plugin:")) == 0)
+      gl_search_field (GIF_PLUGIN, term_lc + strlen ("plugin:"),
+          print_graph_inst_html, /* user_data = */ &cb_data);
+    else if (strncmp ("plugin_instance:", term_lc, strlen ("plugin_instance:")) == 0)
+      gl_search_field (GIF_PLUGIN_INSTANCE, term_lc + strlen ("plugin_instance:"),
+          print_graph_inst_html, /* user_data = */ &cb_data);
+    else if (strncmp ("type:", term_lc, strlen ("type:")) == 0)
+      gl_search_field (GIF_TYPE, term_lc + strlen ("type:"),
+          print_graph_inst_html, /* user_data = */ &cb_data);
+    else if (strncmp ("type_instance:", term_lc, strlen ("type_instance:")) == 0)
+      gl_search_field (GIF_TYPE_INSTANCE, term_lc + strlen ("type_instance:"),
+          print_graph_inst_html, /* user_data = */ &cb_data);
+    else
+      gl_search (term_lc,
+          print_graph_inst_html, /* user_data = */ &cb_data);
+
     free (term_lc);
   }
 
@@ -128,99 +148,33 @@ static int print_search_result (void *user_data) /* {{{ */
   return (0);
 } /* }}} int print_search_result */
 
-struct print_host_list_data_s
-{
-  str_array_t *array;
-  char *last_host;
-};
-typedef struct print_host_list_data_s print_host_list_data_t;
-
-static int print_host_list_callback (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst, void *user_data)
+static int print_host_list_callback (const char *host, void *user_data) /* {{{ */
 {
-  print_host_list_data_t *data = user_data;
-  graph_ident_t *ident;
-  const char *host;
+  char *host_html;
 
-  /* make compiler happy */
-  cfg = NULL;
+  /* Make compiler happy */
+  user_data = NULL;
 
-  ident = inst_get_selector (inst);
-  if (ident == NULL)
-    return (-1);
-
-  host = ident_get_host (ident);
   if (host == NULL)
-  {
-    ident_destroy (ident);
-    return (-1);
-  }
+    return (EINVAL);
+  
+  host_html = html_escape (host);
+  if (host_html == NULL)
+    return (ENOMEM);
 
-  if (IS_ALL (host))
-    return (0);
+  printf ("  <li class=\"host\"><a href=\"%s?action=list_graphs;q=host:%s\">"
+      "%s</a></li>\n",
+      script_name (), host_html, host_html);
 
-  if ((data->last_host != NULL)
-      && (strcmp (data->last_host, host) == 0))
-  {
-    ident_destroy (ident);
-    return (0);
-  }
-
-  free (data->last_host);
-  data->last_host = strdup (host);
-
-  array_append (data->array, host);
-
-  ident_destroy (ident);
   return (0);
 } /* }}} int print_host_list_callback */
 
 static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
 {
-  print_host_list_data_t data;
-  int hosts_argc;
-  char **hosts_argv;
-  int i;
-
-  data.array = array_create ();
-  data.last_host = NULL;
-
-  gl_instance_get_all (print_host_list_callback, &data);
-
-  free (data.last_host);
-  data.last_host = NULL;
-
-  array_sort (data.array);
-
-  hosts_argc = array_argc (data.array);
-  hosts_argv = array_argv (data.array);
-
-  if (hosts_argc < 1)
-  {
-    array_destroy (data.array);
-    return (0);
-  }
-
-  printf ("<ul id=\"host-list\">\n");
-  for (i = 0; i < hosts_argc; i++)
-  {
-    char *host = hosts_argv[i];
-    char *host_html;
-
-    if ((data.last_host != NULL) && (strcmp (data.last_host, host) == 0))
-      continue;
-    data.last_host = host;
-
-    host_html = html_escape (host);
-
-    printf ("  <li><a href=\"%s?action=list_graphs&search=%s\">%s</a></li>\n",
-        script_name (), host_html, host_html);
-
-    free (host_html);
-  }
-  printf ("</ul>\n");
-
-  array_destroy (data.array);
+  printf ("<div><h3>List of hosts</h3>\n"
+      "<ul id=\"host-list\">\n");
+  gl_foreach_host (print_host_list_callback, /* user data = */ NULL);
+  printf ("</ul></div>\n");
 
   return (0);
 } /* }}} int print_host_list */
@@ -256,10 +210,8 @@ int action_list_graphs (void) /* {{{ */
 
   gl_update ();
 
-  search = strtolower_copy (param ("search"));
-
+  search = strtolower_copy (param ("q"));
   status = list_graphs_html (search);
-
   free (search);
 
   return (status);