X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=7c8768a58ece8fecc83e6cfb2fcebf5b98c2fb14;hb=173727f52463a5e2f60e7363456f90905d67e669;hp=131a6fb1f3e439fcbde8d0c31673ca0fcb8de3f4;hpb=d83e2903e3ab90e605fee0b24e48b7cb8548e6ea;p=collection4.git

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index 131a6fb..7c8768a 100644
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -4,6 +4,7 @@
 #include <errno.h>
 
 #include "action_list_graphs.h"
+#include "common.h"
 #include "graph.h"
 #include "graph_ident.h"
 #include "graph_list.h"
@@ -12,6 +13,8 @@
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
 
+#define RESULT_LIMIT 50
+
 struct callback_data_s
 {
   graph_config_t *cfg;
@@ -20,224 +23,222 @@ struct callback_data_s
 };
 typedef struct callback_data_s callback_data_t;
 
-static int json_begin_graph (graph_config_t *cfg) /* {{{ */
+static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
+    void *user_data)
 {
+  callback_data_t *data = user_data;
+  char params[1024];
   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 */
+  if (data->cfg != cfg)
+  {
+    if (data->cfg != NULL)
+      printf ("  </ul></li>\n");
 
-static int json_end_graph (void) /* {{{ */
-{
-  printf ("]}");
+    memset (desc, 0, sizeof (desc));
+    graph_get_title (cfg, desc, sizeof (desc));
+    html_escape_buffer (desc, sizeof (desc));
 
-  return (0);
-} /* }}} int json_end_graph */
+    printf ("  <li class=\"graph\">%s\n"
+        "  <ul class=\"instance_list\">\n", desc);
 
-static int json_print_instance (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst)
-{
-  char params[1024];
-  char desc[1024];
+    data->cfg = cfg;
+  }
 
-  if ((cfg == NULL) || (inst == NULL))
-    return (EINVAL);
+  memset (params, 0, sizeof (params));
+  inst_get_params (cfg, inst, params, sizeof (params));
+  html_escape_buffer (params, sizeof (params));
 
   memset (desc, 0, sizeof (desc));
   inst_describe (cfg, inst, desc, sizeof (desc));
+  html_escape_buffer (desc, sizeof (desc));
 
-  memset (params, 0, sizeof (params));
-  inst_get_params (cfg, inst, params, sizeof (params));
+  printf ("    <li class=\"instance\"><a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
+      script_name (), params, desc);
 
-  printf ("{\"description\":\"%s\",\"params\":\"%s\"}",
-      desc, params);
+  if (data->limit > 0)
+    data->limit--;
+
+  /* Abort scan if limit is reached. */
+  if (data->limit == 0)
+    return (1);
 
   return (0);
-} /* }}} int json_print_instance */
+} /* }}} int print_graph_inst_html */
 
-static int print_graph_inst_json (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst,
-    void *user_data)
+struct page_data_s
 {
-  callback_data_t *data = user_data;
+  const char *search_term;
+};
+typedef struct page_data_s page_data_t;
 
-  if (data->cfg != cfg)
-  {
-    if (!data->first)
-    {
-      json_end_graph ();
-      printf (",\n");
-    }
-    json_begin_graph (cfg);
+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 };
 
-    data->cfg = cfg;
-    data->first = 0;
-  }
-  else /* if (not first instance) */
+  if (pg_data->search_term != NULL)
   {
-    printf (",\n");
+    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);
   }
 
-  json_print_instance (cfg, inst);
+  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);
+  else
+  {
+    char *term_lc = strtolower_copy (pg_data->search_term);
+    gl_search (term_lc, print_graph_inst_html, /* user_data = */ &cb_data);
+    free (term_lc);
+  }
 
-  if (data->limit > 0)
-    data->limit--;
+  if (cb_data.cfg != NULL)
+    printf ("      </ul></li>\n");
 
-  if (data->limit == 0)
-    return (1);
+  printf ("    </ul>\n");
 
   return (0);
-} /* }}} int print_graph_inst_json */
+} /* }}} int print_search_result */
 
-static int list_graphs_json (const char *term) /* {{{ */
+struct print_host_list_data_s
 {
-  callback_data_t data;
+  str_array_t *array;
+  char *last_host;
+};
+typedef struct print_host_list_data_s print_host_list_data_t;
 
-  time_t now;
-  char time_buffer[128];
-  int status;
+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;
 
-  printf ("Content-Type: application/json\n");
+  /* make compiler happy */
+  cfg = NULL;
 
-  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");
+  ident = inst_get_selector (inst);
+  if (ident == NULL)
+    return (-1);
 
-  data.cfg = NULL;
-  data.limit = 20;
-  data.first = 1;
+  host = ident_get_host (ident);
+  if (host == NULL)
+  {
+    ident_destroy (ident);
+    return (-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 (IS_ALL (host))
+    return (0);
 
-  if (!data.first)
-    json_end_graph ();
+  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);
 
-  printf ("\n]");
+  array_append (data->array, host);
 
+  ident_destroy (ident);
   return (0);
-} /* }}} int list_graphs_json */
+} /* }}} int print_host_list_callback */
 
-static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
-    graph_instance_t *inst,
-    void *user_data)
+static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
 {
-  callback_data_t *data = user_data;
-  char params[1024];
-  char desc[1024];
+  print_host_list_data_t data;
+  int hosts_argc;
+  char **hosts_argv;
+  int i;
 
-  if (data->cfg != cfg)
-  {
-    if (data->cfg != NULL)
-      printf ("  </ul></li>\n");
+  data.array = array_create ();
+  data.last_host = NULL;
 
-    memset (desc, 0, sizeof (desc));
-    graph_get_title (cfg, desc, sizeof (desc));
-    html_escape_buffer (desc, sizeof (desc));
+  gl_instance_get_all (print_host_list_callback, &data);
 
-    printf ("  <li class=\"graph\">%s\n"
-        "  <ul class=\"instance_list\">\n", desc);
+  free (data.last_host);
+  data.last_host = NULL;
 
-    data->cfg = cfg;
+  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);
   }
 
-  memset (params, 0, sizeof (params));
-  inst_get_params (cfg, inst, params, sizeof (params));
-  html_escape_buffer (params, sizeof (params));
+  printf ("<ul id=\"host-list\">\n");
+  for (i = 0; i < hosts_argc; i++)
+  {
+    char *host = hosts_argv[i];
+    char *host_html;
 
-  memset (desc, 0, sizeof (desc));
-  inst_describe (cfg, inst, desc, sizeof (desc));
-  html_escape_buffer (desc, sizeof (desc));
+    if ((data.last_host != NULL) && (strcmp (data.last_host, host) == 0))
+      continue;
+    data.last_host = host;
 
-  printf ("    <li class=\"instance\"><a href=\"%s?action=graph;%s\">%s</a></li>\n",
-      script_name (), params, desc);
+    host_html = html_escape (host);
 
-  if (data->limit > 0)
-    data->limit--;
+    printf ("  <li><a href=\"%s?action=list_graphs&search=%s\">%s</a></li>\n",
+        script_name (), host_html, host_html);
 
-  /* Abort scan if limit is reached. */
-  if (data->limit == 0)
-    return (1);
+    free (host_html);
+  }
+  printf ("</ul>\n");
+
+  array_destroy (data.array);
 
   return (0);
-} /* }}} int print_graph_inst_html */
+} /* }}} int print_host_list */
 
 static int list_graphs_html (const char *term) /* {{{ */
 {
-  callback_data_t data = { NULL, /* limit = */ 20, /* first = */ 1 };
-  char *term_html;
+  page_data_t pg_data;
+  page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;
+  char title[512];
 
-  term_html = NULL;
   if (term != NULL)
-    term_html = html_escape (term);
-
-  printf ("Content-Type: text/html\n\n");
-
-  printf ("<html>\n  <head>\n");
-  if (term != NULL)
-    printf ("    <title>c4: Graphs matching &quot;%s&quot;</title>\n", term);
-  else
-    printf ("    <title>c4: List of all graphs</title>\n");
-  printf ("    <link rel=\"stylesheet\" type=\"text/css\" href=\"../share/style.css\" />\n");
-  printf ("    <script type=\"text/javascript\" src=\"../share/jquery-1.4.2.min.js\">\n"
-      "    </script>\n"
-      "    <script type=\"text/javascript\" src=\"../share/collection.js\">\n"
-      "    </script>\n");
-  printf ("  </head>\n  <body>\n");
-
-  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 : "");
-
-  free (term_html);
-
-  printf ("    <ul id=\"search-output\" class=\"graph_list\">\n");
-  if (term == NULL)
-    gl_instance_get_all (print_graph_inst_html, /* user_data = */ &data);
+    snprintf (title, sizeof (title), "c4: Graphs matching \"%s\"", term);
   else
-    gl_search (term, print_graph_inst_html, /* user_data = */ &data);
+    strncpy (title, "c4: List of all graphs", sizeof (title));
+  title[sizeof (title) - 1] = 0;
 
-  if (data.cfg != NULL)
-    printf ("      </ul></li>\n");
+  memset (&pg_data, 0, sizeof (pg_data));
+  pg_data.search_term = term;
 
-  printf ("    </ul>\n");
+  pg_callbacks.top_right = html_print_search_box;
+  pg_callbacks.middle_left = print_host_list;
+  pg_callbacks.middle_center = print_search_result;
 
-  printf ("  </body>\n</html>\n");
+  html_print_page (title, &pg_callbacks, &pg_data);
 
   return (0);
 } /* }}} int list_graphs_html */
 
 int action_list_graphs (void) /* {{{ */
 {
-  const char *format;
+  char *search;
+  int status;
 
   gl_update ();
 
-  format = param ("format");
-  if (format == NULL)
-    format = "html";
+  search = strtolower_copy (param ("search"));
 
-  if (strcmp ("json", format) == 0)
-    return (list_graphs_json (param ("search")));
-  else
-    return (list_graphs_html (param ("search")));
+  status = list_graphs_html (search);
+
+  free (search);
+
+  return (status);
 } /* }}} int action_list_graphs */
 
 /* vim: set sw=2 sts=2 et fdm=marker : */