X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=7973a08edfd9081806ef28dae8b6093c2a98e882;hb=d57d345c057f784293439936f8a62fe01cffde06;hp=dad436720e3830610e185bbd7c2860ea47dc307d;hpb=7879274a21ee7dcb30253e96b4dca792c38ae931;p=collection4.git

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index dad4367..7973a08 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,123 +42,16 @@
 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;
+  const char *search_term;
 };
 typedef struct callback_data_s callback_data_t;
 
-static int json_begin_graph (graph_config_t *cfg) /* {{{ */
-{
-  char desc[1024];
-
-  if (cfg == NULL)
-    return (EINVAL);
-
-  graph_get_title (cfg, desc, sizeof (desc));
-
-  printf ("{\"title\":\"%s\",\"instances\":[", desc);
-
-  return (0);
-} /* }}} int json_begin_graph */
-
-static int json_end_graph (void) /* {{{ */
-{
-  printf ("]}");
-
-  return (0);
-} /* }}} int json_end_graph */
-
-static int json_print_instance (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst)
-{
-  char params[1024];
-  char desc[1024];
-
-  if ((cfg == NULL) || (inst == NULL))
-    return (EINVAL);
-
-  memset (desc, 0, sizeof (desc));
-  inst_describe (cfg, inst, desc, sizeof (desc));
-
-  memset (params, 0, sizeof (params));
-  inst_get_params (cfg, inst, params, sizeof (params));
-
-  printf ("{\"description\":\"%s\",\"params\":\"%s\"}",
-      desc, params);
-
-  return (0);
-} /* }}} int json_print_instance */
-
-static int print_graph_inst_json (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst,
-    void *user_data)
-{
-  callback_data_t *data = user_data;
-
-  if (data->cfg != cfg)
-  {
-    if (!data->first)
-    {
-      json_end_graph ();
-      printf (",\n");
-    }
-    json_begin_graph (cfg);
-
-    data->cfg = cfg;
-    data->first = 0;
-  }
-  else /* if (not first instance) */
-  {
-    printf (",\n");
-  }
-
-  json_print_instance (cfg, inst);
-
-  if (data->limit > 0)
-    data->limit--;
-
-  if (data->limit == 0)
-    return (1);
-
-  return (0);
-} /* }}} int print_graph_inst_json */
-
-static int list_graphs_json (const char *term) /* {{{ */
-{
-  callback_data_t data;
-
-  time_t now;
-  char time_buffer[128];
-  int status;
-
-  printf ("Content-Type: application/json\n");
-
-  now = time (NULL);
-  status = time_to_rfc1123 (now + 300, time_buffer, sizeof (time_buffer));
-  if (status == 0)
-    printf ("Expires: %s\n"
-        "Cache-Control: public\n",
-        time_buffer);
-  printf ("\n");
-
-  data.cfg = NULL;
-  data.limit = RESULT_LIMIT;
-  data.first = 1;
-
-  printf ("[\n");
-  if (term == NULL)
-    gl_instance_get_all (print_graph_inst_json, /* user_data = */ &data);
-  else
-    gl_search (term, print_graph_inst_json, /* user_data = */ &data);
-
-  if (!data.first)
-    json_end_graph ();
-
-  printf ("\n]");
-
-  return (0);
-} /* }}} int list_graphs_json */
-
 static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
     graph_instance_t *inst,
     void *user_data)
@@ -145,6 +62,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");
 
@@ -156,6 +80,39 @@ 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)
+    {
+      char *search_term_html = html_escape (data->search_term);
+      char param_search_term[1024];
+
+      memset (params, 0, sizeof (params));
+      graph_get_params (cfg, params, sizeof (params));
+      html_escape_buffer (params, sizeof (params));
+
+      param_search_term[0] = 0;
+      if (search_term_html != NULL)
+      {
+        snprintf (param_search_term, sizeof (param_search_term), ";q=%s",
+            search_term_html);
+        param_search_term[sizeof (param_search_term) - 1] = 0;
+      }
+
+      free (search_term_html);
+
+      printf ("    <li class=\"instance more\"><a href=\"%s"
+          "?action=show_graph;%s%s\">More &#x2026;</a></li>\n",
+          script_name (), params, param_search_term);
+
+      data->inst_more = 1;
+    }
+    return (0);
   }
 
   memset (params, 0, sizeof (params));
@@ -166,167 +123,129 @@ 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=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 */
 
-struct page_data_s
-{
-  const char *search_term;
-};
-typedef struct page_data_s page_data_t;
-
-static int print_search_box (void *user_data) /* {{{ */
+static int print_graph_html (graph_config_t *cfg, /* {{{ */
+    __attribute__((unused)) void *user_data)
 {
-  page_data_t *data = user_data;
-  char *term_html;
+  char params[1024];
+  char title[1024];
 
-  if (data == NULL)
-  {
-    fprintf (stderr, "print_search_box: data == NULL\n");
-    return (EINVAL);
-  }
+  if (graph_num_instances (cfg) < 1)
+    return (0);
 
-  term_html = html_escape (data->search_term);
+  memset (title, 0, sizeof (title));
+  graph_get_title (cfg, title, sizeof (title));
+  html_escape_buffer (title, sizeof (title));
 
-  printf ("<form action=\"%s\" method=\"get\">\n"
-      "  <input type=\"hidden\" name=\"action\" value=\"list_graphs\" />\n"
-      "  <input type=\"text\" name=\"search\" value=\"%s\" id=\"search-input\" />\n"
-      "  <input type=\"submit\" name=\"button\" value=\"Search\" />\n"
-      "</form>\n",
-      script_name (),
-      (term_html != NULL) ? term_html : "");
+  memset (params, 0, sizeof (params));
+  graph_get_params (cfg, params, sizeof (params));
+  html_escape_buffer (params, sizeof (params));
 
-  free (term_html);
+  printf ("      <li class=\"graph\"><a href=\"%s?action=show_graph;%s\">"
+      "%s</a></li>\n",
+      script_name (), params, title);
 
   return (0);
-} /* }}} int print_search_box */
+} /* }}} int print_graph_html */
+
+struct page_data_s
+{
+  const char *search_term;
+};
+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,
+    /* search_term = */ pg_data->search_term };
+
+  if (pg_data->search_term != NULL)
+  {
+    char *search_term_html = html_escape (pg_data->search_term);
+    printf ("    <h2>Search results for &quot;%s&quot;</h2>\n",
+        search_term_html);
+    free (search_term_html);
+  }
 
   printf ("    <ul id=\"search-output\" class=\"graph_list\">\n");
   if (pg_data->search_term == NULL)
-    gl_instance_get_all (print_graph_inst_html, /* user_data = */ &cb_data);
+  {
+    gl_graph_get_all (print_graph_html, /* user_data = */ &cb_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
+static int print_host_list_callback (const char *host, void *user_data) /* {{{ */
 {
-  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)
-{
-  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);
-  }
-
-  if (IS_ALL (host))
-    return (0);
-
-  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);
+    return (EINVAL);
+  
+  host_html = html_escape (host);
+  if (host_html == NULL)
+    return (ENOMEM);
 
-  array_append (data->array, host);
+  printf ("  <li class=\"host\"><a href=\"%s?action=list_graphs;q=host:%s\">"
+      "%s</a></li>\n",
+      script_name (), host_html, host_html);
 
-  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 */
@@ -338,15 +257,16 @@ static int list_graphs_html (const char *term) /* {{{ */
   char title[512];
 
   if (term != NULL)
-    snprintf (title, sizeof (title), "c4: Graphs matching \"%s\"", term);
+    snprintf (title, sizeof (title), "Graphs matching \"%s\"",
+        term);
   else
-    strncpy (title, "c4: List of all graphs", sizeof (title));
+    strncpy (title, "List of all graphs", sizeof (title));
   title[sizeof (title) - 1] = 0;
 
   memset (&pg_data, 0, sizeof (pg_data));
   pg_data.search_term = term;
 
-  pg_callbacks.top_right = print_search_box;
+  pg_callbacks.top_right = html_print_search_box;
   pg_callbacks.middle_left = print_host_list;
   pg_callbacks.middle_center = print_search_result;
 
@@ -357,23 +277,13 @@ static int list_graphs_html (const char *term) /* {{{ */
 
 int action_list_graphs (void) /* {{{ */
 {
-  const char *format;
   char *search;
   int status;
 
   gl_update ();
 
-  search = strtolower_copy (param ("search"));
-
-  format = param ("format");
-  if (format == NULL)
-    format = "html";
-
-  if (strcmp ("json", format) == 0)
-    status = list_graphs_json (search);
-  else
-    status = list_graphs_html (search);
-
+  search = strtolower_copy (param ("q"));
+  status = list_graphs_html (search);
   free (search);
 
   return (status);