X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=6a7ce4fe2538c4bfbe249a16654eafba714504fb;hb=417610268a16cb4b84d79bf449b1f70142791676;hp=a2365173ac43bd0d68d11affff2c828843075241;hpb=c4939342ce1aa40bc845f0d2c826c21cc56d17d7;p=collection4.git

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index a236517..6a7ce4f 100644
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -18,123 +18,15 @@
 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;
 
-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 +37,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 +55,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));
@@ -166,16 +78,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=graph;%s\">%s</a></li>\n",
+  printf ("    <li class=\"instance\"><a href=\"%s?action=show_graph;%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 */
 
@@ -188,7 +93,17 @@ 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)
+  {
+    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)
@@ -196,13 +111,31 @@ 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 ("type:", term_lc, strlen ("type:")) == 0)
+      gl_search_field (GIF_TYPE, term_lc + strlen ("type:"),
+          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);
@@ -281,7 +214,8 @@ static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
     return (0);
   }
 
-  printf ("<ul id=\"host-list\">\n");
+  printf ("<div><h3>List of hosts</h3>\n"
+      "<ul id=\"host-list\">\n");
   for (i = 0; i < hosts_argc; i++)
   {
     char *host = hosts_argv[i];
@@ -293,12 +227,12 @@ static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
 
     host_html = html_escape (host);
 
-    printf ("  <li><a href=\"%s?action=list_graphs&search=%s\">%s</a></li>\n",
+    printf ("  <li><a href=\"%s?action=list_graphs&q=host:%s\">%s</a></li>\n",
         script_name (), host_html, host_html);
 
     free (host_html);
   }
-  printf ("</ul>\n");
+  printf ("</ul></div>\n");
 
   array_destroy (data.array);
 
@@ -331,23 +265,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);