X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=6a7ce4fe2538c4bfbe249a16654eafba714504fb;hb=8ef2ef705bc5f5b4aa758f92ed8ceb1cec42f7c8;hp=922308b0637df0ebd3e4ce8d672e6e5a70855d5d;hpb=30478870f2afaf991ee19ab7b4c22d3ddcd7b8cd;p=collection4.git
diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index 922308b..6a7ce4f 100644
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -18,8 +18,12 @@
struct callback_data_s
{
graph_config_t *cfg;
- int limit;
- _Bool first;
+ int graph_index;
+ int graph_limit;
+ _Bool graph_more;
+ int inst_index;
+ int inst_limit;
+ _Bool inst_more;
};
typedef struct callback_data_s callback_data_t;
@@ -33,6 +37,13 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
if (data->cfg != cfg)
{
+ data->graph_index++;
+ if (data->graph_index >= data->graph_limit)
+ {
+ data->graph_more = 1;
+ return (1);
+ }
+
if (data->cfg != NULL)
printf (" \n");
@@ -44,6 +55,19 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
"
\n", desc);
data->cfg = cfg;
+ data->inst_index = -1;
+ data->inst_more = 0;
+ }
+
+ data->inst_index++;
+ if (data->inst_index >= data->inst_limit)
+ {
+ if (!data->inst_more)
+ {
+ printf (" - More ...
\n");
+ data->inst_more = 1;
+ }
+ return (0);
}
memset (params, 0, sizeof (params));
@@ -54,16 +78,9 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
inst_describe (cfg, inst, desc, sizeof (desc));
html_escape_buffer (desc, sizeof (desc));
- printf (" - %s
\n",
+ printf (" - %s
\n",
script_name (), params, desc);
- if (data->limit > 0)
- data->limit--;
-
- /* Abort scan if limit is reached. */
- if (data->limit == 0)
- return (1);
-
return (0);
} /* }}} int print_graph_inst_html */
@@ -76,7 +93,9 @@ typedef struct page_data_s page_data_t;
static int print_search_result (void *user_data) /* {{{ */
{
page_data_t *pg_data = user_data;
- callback_data_t cb_data = { NULL, /* limit = */ RESULT_LIMIT, /* first = */ 1 };
+ callback_data_t cb_data = { /* cfg = */ NULL,
+ /* graph_index = */ -1, /* graph_limit = */ 20, /* graph_more = */ 0,
+ /* inst_index = */ -1, /* inst_limit = */ 5, /* inst more = */ 0 };
if (pg_data->search_term != NULL)
{
@@ -92,13 +111,31 @@ static int print_search_result (void *user_data) /* {{{ */
else
{
char *term_lc = strtolower_copy (pg_data->search_term);
- gl_search (term_lc, print_graph_inst_html, /* user_data = */ &cb_data);
+
+ if (strncmp ("host:", term_lc, strlen ("host:")) == 0)
+ gl_search_field (GIF_HOST, term_lc + strlen ("host:"),
+ print_graph_inst_html, /* user_data = */ &cb_data);
+ else if (strncmp ("plugin:", term_lc, strlen ("plugin:")) == 0)
+ gl_search_field (GIF_PLUGIN, term_lc + strlen ("plugin:"),
+ print_graph_inst_html, /* user_data = */ &cb_data);
+ else if (strncmp ("type:", term_lc, strlen ("type:")) == 0)
+ gl_search_field (GIF_TYPE, term_lc + strlen ("type:"),
+ print_graph_inst_html, /* user_data = */ &cb_data);
+ else
+ gl_search (term_lc,
+ print_graph_inst_html, /* user_data = */ &cb_data);
+
free (term_lc);
}
if (cb_data.cfg != NULL)
printf ("
\n");
+ if (cb_data.graph_more)
+ {
+ printf (" More ...\n");
+ }
+
printf (" \n");
return (0);
@@ -177,7 +214,8 @@ static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
return (0);
}
- printf ("\n");
+ printf ("List of hosts
\n"
+ "
\n");
for (i = 0; i < hosts_argc; i++)
{
char *host = hosts_argv[i];
@@ -189,12 +227,12 @@ static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
host_html = html_escape (host);
- printf (" - %s
\n",
+ printf (" - %s
\n",
script_name (), host_html, host_html);
free (host_html);
}
- printf ("
\n");
+ printf ("
\n");
array_destroy (data.array);
@@ -232,10 +270,8 @@ int action_list_graphs (void) /* {{{ */
gl_update ();
- search = strtolower_copy (param ("search"));
-
+ search = strtolower_copy (param ("q"));
status = list_graphs_html (search);
-
free (search);
return (status);