From d83e2903e3ab90e605fee0b24e48b7cb8548e6ea Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sun, 20 Jun 2010 19:39:41 +0200 Subject: [PATCH] Add JavaScript code for AJAX-based "real time" searching. --- share/Makefile.am | 4 +- share/collection.js | 46 +++++++++++++++ src/action_list_graphs.c | 144 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 154 insertions(+), 40 deletions(-) create mode 100644 share/collection.js diff --git a/share/Makefile.am b/share/Makefile.am index 7035535..0875a62 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -1,3 +1,5 @@ dist_sysconf_DATA = collection.conf -dist_data_DATA = style.css jquery-1.4.2.min.js +dist_data_DATA = style.css \ + collection.js \ + jquery-1.4.2.min.js diff --git a/share/collection.js b/share/collection.js new file mode 100644 index 0000000..1afd64c --- /dev/null +++ b/share/collection.js @@ -0,0 +1,46 @@ +function format_instance(inst) +{ + return ("
  • " + inst.description + "
  • "); +} + +function format_instance_list(instances) +{ + var ret = ""; + + return (ret); +} + +function format_graph(graph) +{ + return ("
  • " + graph.title + format_instance_list (graph.instances) + "
  • "); +} + +$(document).ready(function() { + $("#search-input").keyup (function() + { + var term = $("#search-input").val (); + $.getJSON ("collection.fcgi", + { "action": "list_graphs", "format": "json", "search": term}, + function(data) + { + var i; + $("#search-output").html (""); + for (i = 0; i < data.length; i++) + { + var graph = data[i]; + $("#search-output").append (format_graph (graph)); + } + }); + }); +}); + +/* vim: set sw=2 sts=2 et fdm=marker : */ diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c index 6e4f0d4..131a6fb 100644 --- a/src/action_list_graphs.c +++ b/src/action_list_graphs.c @@ -12,64 +12,126 @@ #include #include -static int print_graph_inst_json (__attribute__((unused)) graph_config_t *cfg, /* {{{ */ +struct callback_data_s +{ + graph_config_t *cfg; + int limit; + _Bool first; +}; +typedef struct callback_data_s callback_data_t; + +static int json_begin_graph (graph_config_t *cfg) /* {{{ */ +{ + char desc[1024]; + + if (cfg == NULL) + return (EINVAL); + + graph_get_title (cfg, desc, sizeof (desc)); + + printf ("{\"title\":\"%s\",\"instances\":[", desc); + + return (0); +} /* }}} int json_begin_graph */ + +static int json_end_graph (void) /* {{{ */ +{ + printf ("]}"); + + return (0); +} /* }}} int json_end_graph */ + +static int json_print_instance (graph_config_t *cfg, /* {{{ */ + graph_instance_t *inst) +{ + char params[1024]; + char desc[1024]; + + if ((cfg == NULL) || (inst == NULL)) + return (EINVAL); + + memset (desc, 0, sizeof (desc)); + inst_describe (cfg, inst, desc, sizeof (desc)); + + memset (params, 0, sizeof (params)); + inst_get_params (cfg, inst, params, sizeof (params)); + + printf ("{\"description\":\"%s\",\"params\":\"%s\"}", + desc, params); + + return (0); +} /* }}} int json_print_instance */ + +static int print_graph_inst_json (graph_config_t *cfg, /* {{{ */ graph_instance_t *inst, void *user_data) { - _Bool *first; - graph_ident_t *ident; - char *json; - - first = user_data; + callback_data_t *data = user_data; - ident = inst_get_selector (inst); - if (ident == NULL) - return (-1); + if (data->cfg != cfg) + { + if (!data->first) + { + json_end_graph (); + printf (",\n"); + } + json_begin_graph (cfg); - json = ident_to_json (ident); - if (json == NULL) + data->cfg = cfg; + data->first = 0; + } + else /* if (not first instance) */ { - ident_destroy (ident); - return (ENOMEM); + printf (",\n"); } - if (*first) - printf ("%s", json); - else - printf (",\n%s", json); + json_print_instance (cfg, inst); - *first = 0; + if (data->limit > 0) + data->limit--; + + if (data->limit == 0) + return (1); - ident_destroy (ident); return (0); } /* }}} int print_graph_inst_json */ -static int print_graph_json (graph_config_t *cfg, /* {{{ */ - void *user_data) +static int list_graphs_json (const char *term) /* {{{ */ { - return (gl_graph_instance_get_all (cfg, print_graph_inst_json, user_data)); -} /* }}} int print_graph_json */ + callback_data_t data; -static int list_graphs_json (void) /* {{{ */ -{ - _Bool first = 1; + time_t now; + char time_buffer[128]; + int status; + + printf ("Content-Type: application/json\n"); + + now = time (NULL); + status = time_to_rfc1123 (now + 300, time_buffer, sizeof (time_buffer)); + if (status == 0) + printf ("Expires: %s\n" + "Cache-Control: public\n", + time_buffer); + printf ("\n"); - printf ("Content-Type: application/json\n\n"); + data.cfg = NULL; + data.limit = 20; + data.first = 1; printf ("[\n"); - gl_graph_get_all (print_graph_json, /* user_data = */ &first); + if (term == NULL) + gl_instance_get_all (print_graph_inst_json, /* user_data = */ &data); + else + gl_search (term, print_graph_inst_json, /* user_data = */ &data); + + if (!data.first) + json_end_graph (); + printf ("\n]"); return (0); } /* }}} int list_graphs_json */ -struct callback_data_s -{ - graph_config_t *cfg; - int limit; -}; -typedef struct callback_data_s callback_data_t; - static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */ graph_instance_t *inst, void *user_data) @@ -116,7 +178,7 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */ static int list_graphs_html (const char *term) /* {{{ */ { - callback_data_t data = { NULL, /* limit = */ 20 }; + callback_data_t data = { NULL, /* limit = */ 20, /* first = */ 1 }; char *term_html; term_html = NULL; @@ -131,18 +193,22 @@ static int list_graphs_html (const char *term) /* {{{ */ else printf (" c4: List of all graphs\n"); printf (" \n"); + printf (" \n" + " \n"); printf (" \n \n"); printf ("
    \n" " \n" - " \n" + " \n" " \n" "
    \n", script_name (), (term_html != NULL) ? term_html : ""); free (term_html); - printf ("
      \n"); + printf ("
        \n"); if (term == NULL) gl_instance_get_all (print_graph_inst_html, /* user_data = */ &data); else @@ -169,7 +235,7 @@ int action_list_graphs (void) /* {{{ */ format = "html"; if (strcmp ("json", format) == 0) - return (list_graphs_json ()); + return (list_graphs_json (param ("search"))); else return (list_graphs_html (param ("search"))); } /* }}} int action_list_graphs */ -- 2.11.0