X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Faction_show_instance.c;h=bb807a62af026b2a1af4a7bc8bf298a3ae5e34c8;hp=86a565496c627344c85db68e614bf5eec3b29396;hb=c4c851ce35ad88eff7f843dbced132f55b8a2f6c;hpb=bf5ca77e08ca75fba83c7c5a9a7bb288692ae6d6 diff --git a/src/action_show_instance.c b/src/action_show_instance.c index 86a5654..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 ("%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,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\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 */ @@ -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)