X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Faction_show_instance.c;h=ab276f7dabc49715b5c17205648ebcca70bfa41c;hp=b7fe03dd7c7a43c47c4061dfbd51b924e4c5fe82;hb=54f061537f01d36d0ecac0777fdb12780723eaa0;hpb=f8fd749bce227816f75f87e592e78631bd786425 diff --git a/src/action_show_instance.c b/src/action_show_instance.c index b7fe03d..ab276f7 100644 --- a/src/action_show_instance.c +++ b/src/action_show_instance.c @@ -1,3 +1,26 @@ +/** + * collection4 - action_show_instance.c + * Copyright (C) 2010 Florian octo Forster + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Florian octo Forster + **/ + #include #include #include @@ -47,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); @@ -119,60 +142,48 @@ 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) -{ - 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 ("
  • %s
    • \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 ("
  • " - "%s
    • \n", - script_name (), params, descr); - - return (0); -} /* }}} int show_instance_list_cb */ - -static int show_instance_list (void *user_data) /* {{{ */ +static int left_menu (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 ("
      \n" - "
    • %s\n" - "
        \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
          \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)); - graph_inst_foreach (data->cfg, show_instance_list_cb, user_data); + printf ("
        • Host "%s"
          • \n", + script_name (), host_uri, host_html); + } + printf ("
        \n"); - printf ("
      \n" - "
    \n"); + host = NULL; + ident_destroy (ident); + inst_destroy (inst); return (0); -} /* }}} int show_instance_list */ +} /* }}} int left_menu */ static int show_instance_cb (graph_config_t *cfg, /* {{{ */ graph_instance_t *inst, @@ -183,6 +194,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)); @@ -195,14 +211,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 ("

    Instance "%s"

    \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 ("

    Instance "%s"

    \n", descr); show_breadcrump (cfg, inst); if (data->graph_count < MAX_SHOW_GRAPHS) - printf ("
    \n", - script_name (), params, title, descr); + script_name (), params, time_params, title, descr); else printf ("Show graph " ""%s / %s"\n", @@ -218,7 +246,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) @@ -248,7 +275,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);