X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Faction_show_instance.c;h=0d6b5e2a7be98a16479033a6d9e298c97dba7ccd;hp=0f44fca0ff3e0ee4dcdd24eeaa9ac8d19c87166c;hb=4f4a330557182d024ed5854bd9c79880b6fdaeb6;hpb=9afcb39fe9a6c40e37404f2cf801494319699263
diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index 0f44fca..0d6b5e2 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 ("%s",
+ printf ("%s",
script_name (), field_name, str_html, str_html);
else
- printf ("%s",
+ printf ("%s",
script_name (), str_html, str_html);
free (str_html);
@@ -146,18 +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
\n",
+ " All instances\n"
+ " All graphs\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 (" Host "%s"\n",
+ script_name (), host_uri, host_html);
+ }
+ printf ("\n");
+
+ host = NULL;
+ ident_destroy (ident);
return (0);
} /* }}} int left_menu */
@@ -213,6 +235,14 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
""%s / %s"\n",
script_name (), params, title, descr);
+ printf ("\n", data->graph_count);
+ printf ("\n",
+ data->graph_count, params, (long) begin, (long) end);
+
+ printf ("\n",
+ script_name (), params, time_params);
+
data->graph_count++;
return (0);
@@ -221,15 +251,23 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
static int show_instance (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
+ char params[1024];
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)
fprintf (stderr, "show_instance: inst_get_all_selected failed "
"with status %i\n", status);
+ memset (params, 0, sizeof (params));
+ graph_get_params (data->cfg, params, sizeof (params));
+ html_escape_buffer (params, sizeof (params));
+
+ printf ("\n",
+ script_name (), params);
+
return (0);
} /* }}} int show_instance */