X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=caa90a82b1aeaac1e275c99d6ec43fa9a2e81c60;hb=b64e6b6983c49fa5924fa8558fe1d65f7ea5aea0;hp=7c8768a58ece8fecc83e6cfb2fcebf5b98c2fb14;hpb=25849a1143a916b31fb9782a6cf10399849f88ef;p=collection4.git

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index 7c8768a..caa90a8 100644
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -1,3 +1,26 @@
+/**
+ * collection4 - action_list_graphs.c
+ * Copyright (C) 2010  Florian octo Forster
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Florian octo Forster <ff at octo.it>
+ **/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -7,6 +30,7 @@
 #include "common.h"
 #include "graph.h"
 #include "graph_ident.h"
+#include "graph_instance.h"
 #include "graph_list.h"
 #include "utils_cgi.h"
 
@@ -18,8 +42,12 @@
 struct callback_data_s
 {
   graph_config_t *cfg;
-  int limit;
-  _Bool first;
+  int graph_index;
+  int graph_limit;
+  _Bool graph_more;
+  int inst_index;
+  int inst_limit;
+  _Bool inst_more;
 };
 typedef struct callback_data_s callback_data_t;
 
@@ -33,6 +61,13 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
 
   if (data->cfg != cfg)
   {
+    data->graph_index++;
+    if (data->graph_index >= data->graph_limit)
+    {
+      data->graph_more = 1;
+      return (1);
+    }
+
     if (data->cfg != NULL)
       printf ("  </ul></li>\n");
 
@@ -44,6 +79,19 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
         "  <ul class=\"instance_list\">\n", desc);
 
     data->cfg = cfg;
+    data->inst_index = -1;
+    data->inst_more = 0;
+  }
+
+  data->inst_index++;
+  if (data->inst_index >= data->inst_limit)
+  {
+    if (!data->inst_more)
+    {
+      printf ("    <li class=\"instance more\">More ...</li>\n");
+      data->inst_more = 1;
+    }
+    return (0);
   }
 
   memset (params, 0, sizeof (params));
@@ -54,16 +102,9 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
   inst_describe (cfg, inst, desc, sizeof (desc));
   html_escape_buffer (desc, sizeof (desc));
 
-  printf ("    <li class=\"instance\"><a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
+  printf ("    <li class=\"instance\"><a href=\"%s?action=show_instance;%s\">%s</a></li>\n",
       script_name (), params, desc);
 
-  if (data->limit > 0)
-    data->limit--;
-
-  /* Abort scan if limit is reached. */
-  if (data->limit == 0)
-    return (1);
-
   return (0);
 } /* }}} int print_graph_inst_html */
 
@@ -76,7 +117,9 @@ typedef struct page_data_s page_data_t;
 static int print_search_result (void *user_data) /* {{{ */
 {
   page_data_t *pg_data = user_data;
-  callback_data_t cb_data = { NULL, /* limit = */ RESULT_LIMIT, /* first = */ 1 };
+  callback_data_t cb_data = { /* cfg = */ NULL,
+    /* graph_index = */ -1, /* graph_limit = */ 20, /* graph_more = */ 0,
+    /* inst_index = */  -1, /* inst_limit = */   5, /* inst more = */  0 };
 
   if (pg_data->search_term != NULL)
   {
@@ -92,111 +135,69 @@ 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);
   }
 
   if (cb_data.cfg != NULL)
     printf ("      </ul></li>\n");
 
+  if (cb_data.graph_more)
+  {
+    printf ("    <li class=\"graph more\">More ...</li>\n");
+  }
+
   printf ("    </ul>\n");
 
   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;
-
-  /* make compiler happy */
-  cfg = NULL;
+  char *host_html;
 
-  ident = inst_get_selector (inst);
-  if (ident == NULL)
-    return (-1);
+  /* Make compiler happy */
+  user_data = NULL;
 
-  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 */
@@ -232,10 +233,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);