graph_{data,def}_json actions: Don't destroy the graph_config_t object.

[collection4.git] / src / action_show_instance.c

diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index 86a5654..bb807a6 100644 (file)
--- a/src/action_show_instance.c
+++ b/src/action_show_instance.c
@@ -70,10 +70,10 @@ static void show_breadcrump_field (const char *str, /* {{{ */
     char *str_html = html_escape (str);
 
     if (field_name != NULL)
-      printf ("<a href=\"%s?action=list_graphs;q=%s:%s\">%s</a>",
+      printf ("<a href=\"%s?action=search;q=%s:%s\">%s</a>",
           script_name (), field_name, str_html, str_html);
     else
-      printf ("<a href=\"%s?action=list_graphs;q=%s\">%s</a>",
+      printf ("<a href=\"%s?action=search;q=%s\">%s</a>",
           script_name (), str_html, str_html);
 
     free (str_html);
@@ -146,17 +146,40 @@ static int left_menu (void *user_data) /* {{{ */
 {
   show_graph_data_t *data = user_data;
   char params[1024];
+  graph_instance_t *inst;
+  graph_ident_t *ident;
+  const char *host;
 
   memset (params, 0, sizeof (params));
   graph_get_params (data->cfg, params, sizeof (params));
   html_escape_buffer (params, sizeof (params));
 
+  inst = inst_get_selected (data->cfg);
+  ident = inst_get_selector (inst);
+  host = ident_get_host (ident);
+  if (IS_ANY (host))
+    host = NULL;
+
   printf ("\n<ul class=\"menu left\">\n"
       "  <li><a href=\"%s?action=show_graph;%s\">All instances</a></li>\n"
-      "  <li><a href=\"%s?action=list_graphs\">All graphs</a></li>\n"
-      "</ul>\n",
+      "  <li><a href=\"%s?action=list_graphs\">All graphs</a></li>\n",
       script_name (), params,
       script_name ());
+  if (host != NULL)
+  {
+    char host_html[1024];
+    char host_uri[1024];
+
+    html_escape_copy (host_html, host, sizeof (host_html));
+    uri_escape_copy (host_uri, host, sizeof (host_uri));
+
+    printf ("  <li><a href=\"%s?action=search;q=host:%s\">Host &quot;%s&quot;</a></li>\n",
+        script_name (), host_uri, host_html);
+  }
+  printf ("</ul>\n");
+
+  host = NULL;
+  ident_destroy (ident);
 
   return (0);
 } /* }}} int left_menu */
@@ -222,7 +245,6 @@ static int show_instance (void *user_data) /* {{{ */
   show_graph_data_t *data = user_data;
   int status;
 
-  fprintf (stderr, "show_instance: Calling inst_get_all_selected()\n");
   status = inst_get_all_selected (data->cfg,
       /* callback = */ show_instance_cb, /* user data = */ data);
   if (status != 0)