"list graphs" action: Don't show graphs without instances.

[collection4.git] / src / action_list_graphs.c

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index 42bab5d..7973a08 100644 (file)
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -48,6 +48,7 @@ struct callback_data_s
   int inst_index;
   int inst_limit;
   _Bool inst_more;
+  const char *search_term;
 };
 typedef struct callback_data_s callback_data_t;
 
@@ -88,13 +89,26 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
   {
     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\">More &#x2026;</a></li>\n",
-          script_name (), params);
+          "?action=show_graph;%s%s\">More &#x2026;</a></li>\n",
+          script_name (), params, param_search_term);
 
       data->inst_more = 1;
     }
@@ -121,6 +135,9 @@ static int print_graph_html (graph_config_t *cfg, /* {{{ */
   char params[1024];
   char title[1024];
 
+  if (graph_num_instances (cfg) < 1)
+    return (0);
+
   memset (title, 0, sizeof (title));
   graph_get_title (cfg, title, sizeof (title));
   html_escape_buffer (title, sizeof (title));
@@ -147,7 +164,8 @@ static int print_search_result (void *user_data) /* {{{ */
   page_data_t *pg_data = user_data;
   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 };
+    /* inst_index = */  -1, /* inst_limit = */   5, /* inst more = */  0,
+    /* search_term = */ pg_data->search_term };
 
   if (pg_data->search_term != NULL)
   {
@@ -239,9 +257,10 @@ 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));