From: Florian Forster Date: Mon, 21 Jun 2010 08:41:39 +0000 (+0200) Subject: "list graphs" action: Move the overall HTML structure into src/utils_cgi.c. X-Git-Tag: v4.0.0~217 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7879274a21ee7dcb30253e96b4dca792c38ae931;p=collection4.git "list graphs" action: Move the overall HTML structure into src/utils_cgi.c. --- diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c index f00c6b3..dad4367 100644 --- a/src/action_list_graphs.c +++ b/src/action_list_graphs.c @@ -4,6 +4,7 @@ #include #include "action_list_graphs.h" +#include "common.h" #include "graph.h" #include "graph_ident.h" #include "graph_list.h" @@ -12,6 +13,8 @@ #include #include +#define RESULT_LIMIT 50 + struct callback_data_s { graph_config_t *cfg; @@ -115,7 +118,7 @@ static int list_graphs_json (const char *term) /* {{{ */ printf ("\n"); data.cfg = NULL; - data.limit = 20; + data.limit = RESULT_LIMIT; data.first = 1; printf ("[\n"); @@ -176,50 +179,178 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */ return (0); } /* }}} int print_graph_inst_html */ -static int list_graphs_html (const char *term) /* {{{ */ +struct page_data_s { - callback_data_t data = { NULL, /* limit = */ 20, /* first = */ 1 }; - char *term_html; + const char *search_term; +}; +typedef struct page_data_s page_data_t; - term_html = NULL; - if (term != NULL) - term_html = html_escape (term); +static int print_search_box (void *user_data) /* {{{ */ +{ + page_data_t *data = user_data; + char *term_html; - printf ("Content-Type: text/html\n\n"); + if (data == NULL) + { + fprintf (stderr, "print_search_box: data == NULL\n"); + return (EINVAL); + } - printf ("\n \n"); - if (term != NULL) - printf (" c4: Graphs matching "%s"\n", term); - else - printf (" c4: List of all graphs\n"); - printf (" \n"); - printf (" \n" - " \n"); - printf (" \n \n"); + term_html = html_escape (data->search_term); printf ("
\n" " \n" " \n" " \n" "
\n", - script_name (), (term_html != NULL) ? term_html : ""); + script_name (), + (term_html != NULL) ? term_html : ""); free (term_html); + return (0); +} /* }}} int print_search_box */ + +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 }; + printf ("
    \n"); - if (term == NULL) - gl_instance_get_all (print_graph_inst_html, /* user_data = */ &data); + if (pg_data->search_term == NULL) + gl_instance_get_all (print_graph_inst_html, /* user_data = */ &cb_data); else - gl_search (term, print_graph_inst_html, /* user_data = */ &data); + { + char *term_lc = strtolower_copy (pg_data->search_term); + gl_search (term_lc, print_graph_inst_html, /* user_data = */ &cb_data); + free (term_lc); + } - if (data.cfg != NULL) + if (cb_data.cfg != NULL) printf ("
\n"); printf (" \n"); - printf (" \n\n"); + return (0); +} /* }}} int print_search_result */ + +struct print_host_list_data_s +{ + str_array_t *array; + char *last_host; +}; +typedef struct print_host_list_data_s print_host_list_data_t; + +static int print_host_list_callback (graph_config_t *cfg, /* {{{ */ + graph_instance_t *inst, void *user_data) +{ + print_host_list_data_t *data = user_data; + graph_ident_t *ident; + const char *host; + + /* make compiler happy */ + cfg = NULL; + + ident = inst_get_selector (inst); + if (ident == NULL) + return (-1); + + host = ident_get_host (ident); + if (host == NULL) + { + ident_destroy (ident); + return (-1); + } + + if (IS_ALL (host)) + return (0); + + if ((data->last_host != NULL) + && (strcmp (data->last_host, host) == 0)) + { + ident_destroy (ident); + return (0); + } + + free (data->last_host); + data->last_host = strdup (host); + + array_append (data->array, host); + + ident_destroy (ident); + return (0); +} /* }}} int print_host_list_callback */ + +static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */ +{ + print_host_list_data_t data; + int hosts_argc; + char **hosts_argv; + int i; + + data.array = array_create (); + data.last_host = NULL; + + gl_instance_get_all (print_host_list_callback, &data); + + free (data.last_host); + data.last_host = NULL; + + array_sort (data.array); + + hosts_argc = array_argc (data.array); + hosts_argv = array_argv (data.array); + + if (hosts_argc < 1) + { + array_destroy (data.array); + return (0); + } + + printf ("
    \n"); + for (i = 0; i < hosts_argc; i++) + { + char *host = hosts_argv[i]; + char *host_html; + + if ((data.last_host != NULL) && (strcmp (data.last_host, host) == 0)) + continue; + data.last_host = host; + + host_html = html_escape (host); + + printf ("
  • %s
    • \n", + script_name (), host_html, host_html); + + free (host_html); + } + printf ("
\n"); + + array_destroy (data.array); + + return (0); +} /* }}} int print_host_list */ + +static int list_graphs_html (const char *term) /* {{{ */ +{ + page_data_t pg_data; + page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT; + char title[512]; + + if (term != NULL) + snprintf (title, sizeof (title), "c4: Graphs matching \"%s\"", term); + else + strncpy (title, "c4: List of all graphs", sizeof (title)); + title[sizeof (title) - 1] = 0; + + memset (&pg_data, 0, sizeof (pg_data)); + pg_data.search_term = term; + + pg_callbacks.top_right = print_search_box; + pg_callbacks.middle_left = print_host_list; + pg_callbacks.middle_center = print_search_result; + + html_print_page (title, &pg_callbacks, &pg_data); return (0); } /* }}} int list_graphs_html */ @@ -227,7 +358,7 @@ static int list_graphs_html (const char *term) /* {{{ */ int action_list_graphs (void) /* {{{ */ { const char *format; - const char *search; + char *search; int status; gl_update (); diff --git a/src/utils_cgi.c b/src/utils_cgi.c index fb9a1fb..daf9765 100644 --- a/src/utils_cgi.c +++ b/src/utils_cgi.c @@ -7,6 +7,9 @@ #include "utils_cgi.h" +#include +#include + struct parameter_s { char *key; @@ -355,4 +358,81 @@ char *html_escape (const char *string) /* {{{ */ return (strdup (buffer)); } /* }}} char *html_escape */ +int html_print_page (const char *title, /* {{{ */ + const page_callbacks_t *cb, void *user_data) +{ + char *title_html; + + printf ("Content-Type: text/html\n\n"); + + if (title == NULL) + title = "c4: collection4 graph interface"; + + title_html = html_escape (title); + + printf ("\n" + " \n" + " %s\n" + " \n" + " \n" + " \n" + " \n", + title_html); + + printf (" \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + " \n" + "
"); + if (cb->top_left != NULL) + (*cb->top_left) (user_data); + printf (""); + if (cb->top_center != NULL) + (*cb->top_center) (user_data); + else + printf ("

%s

", title_html); + printf ("		"); + if (cb->top_right != NULL) + (*cb->top_right) (user_data); + printf ("
"); + if (cb->middle_left != NULL) + (*cb->middle_left) (user_data); + printf (""); + if (cb->middle_center != NULL) + (*cb->middle_center) (user_data); + printf (""); + if (cb->middle_right != NULL) + (*cb->middle_right) (user_data); + printf ("
"); + if (cb->bottom_left != NULL) + (*cb->bottom_left) (user_data); + printf (""); + if (cb->bottom_center != NULL) + (*cb->bottom_center) (user_data); + printf (""); + if (cb->bottom_right != NULL) + (*cb->bottom_right) (user_data); + printf ("
\n" + " \n" + "\n"); + + free (title_html); + return (0); +} /* }}} int html_print_page */ + /* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/src/utils_cgi.h b/src/utils_cgi.h index 3204b62..20f806c 100644 --- a/src/utils_cgi.h +++ b/src/utils_cgi.h @@ -3,6 +3,27 @@ #include +typedef int (*page_callback_t) (void *user_data); + +struct page_callbacks_s +{ + page_callback_t top_left; + page_callback_t top_center; + page_callback_t top_right; + page_callback_t middle_left; + page_callback_t middle_center; + page_callback_t middle_right; + page_callback_t bottom_left; + page_callback_t bottom_center; + page_callback_t bottom_right; +}; +typedef struct page_callbacks_s page_callbacks_t; + +#define PAGE_CALLBACKS_INIT \ +{ NULL, NULL, NULL, \ + NULL, NULL, NULL, \ + NULL, NULL, NULL } + int param_init (void); void param_finish (void); @@ -18,5 +39,8 @@ char *html_escape (const char *string); char *html_escape_buffer (char *buffer, size_t buffer_size); char *html_escape_copy (char *dest, const char *src, size_t n); +int html_print_page (const char *title, + const page_callbacks_t *cb, void *user_data); + /* vim: set sw=2 sts=2 et fdm=marker : */ #endif /* UTILS_CGI_H */