X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Faction_show_instance.c;h=bb807a62af026b2a1af4a7bc8bf298a3ae5e34c8;hp=c4ca6cde60a0273387157c4ebc858dd6f5e96726;hb=cff7e32b38767764bf182c7e55505e01b928ea9d;hpb=b988bcc13c655299bc3796cccaa583f62704e759

diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index c4ca6cd..bb807a6 100644
--- 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);
@@ -142,60 +142,47 @@ static int show_time_selector (__attribute__((unused)) void *user_data) /* {{{ *
   return (0);
 } /* }}} int show_time_selector */
 
-static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
-    void *user_data)
+static int left_menu (void *user_data) /* {{{ */
 {
   show_graph_data_t *data = user_data;
-  char descr[128];
   char params[1024];
-
-  memset (descr, 0, sizeof (descr));
-  inst_describe (data->cfg, inst, descr, sizeof (descr));
-  html_escape_buffer (descr, sizeof (descr));
-
-  if (inst == data->inst)
-  {
-    printf ("    <li class=\"instance\"><strong>%s</strong></li>\n", descr);
-    return (0);
-  }
-
-  memset (params, 0, sizeof (params));
-  inst_get_params (data->cfg, inst, params, sizeof (params));
-  html_escape_buffer (params, sizeof (params));
-
-  printf ("    <li class=\"instance\">"
-      "<a href=\"%s?action=show_instance;%s\">%s</a></li>\n",
-      script_name (), params, descr);
-
-  return (0);
-} /* }}} int show_instance_list_cb */
-
-static int show_instance_list (void *user_data) /* {{{ */
-{
-  show_graph_data_t *data = user_data;
-  char title[128];
-  char params[1024];
-
-  memset (title, 0, sizeof (title));
-  graph_get_title (data->cfg, title, sizeof (title));
-  html_escape_buffer (title, sizeof (title));
+  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));
 
-  printf ("<ul class=\"graph_list\">\n"
-      "  <li class=\"graph\"><a href=\"%s?action=show_instance;%s\">%s</a>\n"
-      "  <ul class=\"instance_list\">\n",
-      script_name (), params, title);
+  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",
+      script_name (), params,
+      script_name ());
+  if (host != NULL)
+  {
+    char host_html[1024];
+    char host_uri[1024];
 
-  graph_inst_foreach (data->cfg, show_instance_list_cb, user_data);
+    html_escape_copy (host_html, host, sizeof (host_html));
+    uri_escape_copy (host_uri, host, sizeof (host_uri));
 
-  printf ("  </ul>\n"
-      "</ul>\n");
+    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 show_instance_list */
+} /* }}} int left_menu */
 
 static int show_instance_cb (graph_config_t *cfg, /* {{{ */
     graph_instance_t *inst,
@@ -206,6 +193,11 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
   char descr[128];
   char params[1024];
 
+  long begin;
+  long end;
+  char time_params[128];
+  int status;
+
   memset (title, 0, sizeof (title));
   graph_get_title (cfg, title, sizeof (title));
   html_escape_buffer (title, sizeof (title));
@@ -218,14 +210,26 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
   inst_get_params (cfg, inst, params, sizeof (params));
   html_escape_buffer (params, sizeof (params));
 
-  printf ("<h3>Instance &quot;%s&quot;</h3>\n", descr);
+  time_params[0] = 0;
+  begin = 0;
+  end = 0;
+
+  status = get_time_args (&begin, &end, /* now = */ NULL);
+  if (status == 0)
+  {
+    snprintf (time_params, sizeof (time_params), ";begin=%li;end=%li",
+        begin, end);
+    time_params[sizeof (time_params) - 1] = 0;
+  }
+
+  printf ("<h2>Instance &quot;%s&quot;</h2>\n", descr);
 
   show_breadcrump (cfg, inst);
 
   if (data->graph_count < MAX_SHOW_GRAPHS)
-    printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s\" "
+    printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s%s\" "
         "title=\"%s / %s\" /></div>\n",
-        script_name (), params, title, descr);
+        script_name (), params, time_params, title, descr);
   else
     printf ("<a href=\"%s?action=show_instance;%s\">Show graph "
         "&quot;%s / %s&quot;</a>\n",
@@ -241,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)
@@ -271,7 +274,7 @@ int action_show_instance (void) /* {{{ */
 
   pg_callbacks.top_right = html_print_search_box;
   pg_callbacks.middle_center = show_instance;
-  pg_callbacks.middle_left = show_instance_list;
+  pg_callbacks.middle_left = left_menu;
   pg_callbacks.middle_right = show_time_selector;
 
   html_print_page (title, &pg_callbacks, &pg_data);