"search json" action: Move the JSON callback method into an own action.

diff --git a/share/collection.js b/share/collection.js
index de79a990fff65fb017dc10d83b48e800315a9a37..026d434cc46cf08b08091b879738bca9101f7b4d 100644 (file)
--- a/share/collection.js
+++ b/share/collection.js
@@ -29,7 +29,7 @@ $(document).ready(function() {
     {
       var term = $("#search-input").val ();
       $.getJSON ("collection.fcgi",
-        { "action": "list_graphs", "format": "json", "search": term},
+        { "action": "search_json", "q": term},
         function(data)
         {
           var i;

diff --git a/src/Makefile.am b/src/Makefile.am
index ac11e9fe4eabed33ad46debbfa862edc02a3e8ee..a77f66965a18c0a2a05941e0d2cc3192b3a39059 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@ collection_fcgi_SOURCES = main.c \
                          oconfig.c oconfig.h aux_types.h scanner.l parser.y \
                          action_graph.c action_graph.h \
                          action_list_graphs.c action_list_graphs.h \
+                         action_search_json.c action_search_json.h \
                          common.c common.h \
                          filesystem.c filesystem.h \
                          graph_types.h \

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index a2365173ac43bd0d68d11affff2c828843075241..922308b0637df0ebd3e4ce8d672e6e5a70855d5d 100644 (file)
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -23,118 +23,6 @@ struct callback_data_s
 };
 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)
-{
-  callback_data_t *data = user_data;
-
-  if (data->cfg != cfg)
-  {
-    if (!data->first)
-    {
-      json_end_graph ();
-      printf (",\n");
-    }
-    json_begin_graph (cfg);
-
-    data->cfg = cfg;
-    data->first = 0;
-  }
-  else /* if (not first instance) */
-  {
-    printf (",\n");
-  }
-
-  json_print_instance (cfg, inst);
-
-  if (data->limit > 0)
-    data->limit--;
-
-  if (data->limit == 0)
-    return (1);
-
-  return (0);
-} /* }}} int print_graph_inst_json */
-
-static int list_graphs_json (const char *term) /* {{{ */
-{
-  callback_data_t data;
-
-  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");
-
-  data.cfg = NULL;
-  data.limit = RESULT_LIMIT;
-  data.first = 1;
-
-  printf ("[\n");
-  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 */
-
 static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
     graph_instance_t *inst,
     void *user_data)
@@ -190,6 +78,14 @@ 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 };
 
+  if (pg_data->search_term != NULL)
+  {
+    char *search_term_html = html_escape (pg_data->search_term);
+    printf ("    <h2>Search results for &quot;%s&quot;</h2>\n",
+        search_term_html);
+    free (search_term_html);
+  }
+
   printf ("    <ul id=\"search-output\" class=\"graph_list\">\n");
   if (pg_data->search_term == NULL)
     gl_instance_get_all (print_graph_inst_html, /* user_data = */ &cb_data);
@@ -331,7 +227,6 @@ static int list_graphs_html (const char *term) /* {{{ */
 
 int action_list_graphs (void) /* {{{ */
 {
-  const char *format;
   char *search;
   int status;
 
@@ -339,14 +234,7 @@ int action_list_graphs (void) /* {{{ */
 
   search = strtolower_copy (param ("search"));
 
-  format = param ("format");
-  if (format == NULL)
-    format = "html";
-
-  if (strcmp ("json", format) == 0)
-    status = list_graphs_json (search);
-  else
-    status = list_graphs_html (search);
+  status = list_graphs_html (search);
 
   free (search);
 

diff --git a/src/action_search_json.c b/src/action_search_json.c
new file mode 100644 (file)
index 0000000..0786a8f
--- /dev/null
+++ b/src/action_search_json.c
@@ -0,0 +1,154 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include "action_search_json.h"
+#include "common.h"
+#include "graph.h"
+#include "graph_ident.h"
+#include "graph_list.h"
+#include "utils_cgi.h"
+
+#include <fcgiapp.h>
+#include <fcgi_stdio.h>
+
+#define RESULT_LIMIT 10
+
+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 json_print_graph_instance (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst,
+    void *user_data)
+{
+  callback_data_t *data = user_data;
+
+  if (data->cfg != cfg)
+  {
+    if (!data->first)
+    {
+      json_end_graph ();
+      printf (",\n");
+    }
+    json_begin_graph (cfg);
+
+    data->cfg = cfg;
+    data->first = 0;
+  }
+  else /* if (not first instance) */
+  {
+    printf (",\n");
+  }
+
+  json_print_instance (cfg, inst);
+
+  if (data->limit > 0)
+    data->limit--;
+
+  if (data->limit == 0)
+    return (1);
+
+  return (0);
+} /* }}} int json_print_graph_instance */
+
+static int list_graphs_json (const char *term) /* {{{ */
+{
+  callback_data_t data;
+
+  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");
+
+  data.cfg = NULL;
+  data.limit = RESULT_LIMIT;
+  data.first = 1;
+
+  printf ("[\n");
+  if (term == NULL)
+    gl_instance_get_all (json_print_graph_instance, /* user_data = */ &data);
+  else
+    gl_search (term, json_print_graph_instance, /* user_data = */ &data);
+
+  if (!data.first)
+    json_end_graph ();
+
+  printf ("\n]");
+
+  return (0);
+} /* }}} int list_graphs_json */
+
+int action_search_json (void) /* {{{ */
+{
+  char *search;
+  int status;
+
+  gl_update ();
+
+  search = strtolower_copy (param ("q"));
+
+  status = list_graphs_json (search);
+
+  free (search);
+
+  return (status);
+} /* }}} int action_search_json */
+
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/src/action_search_json.h b/src/action_search_json.h
new file mode 100644 (file)
index 0000000..1bc19c6
--- /dev/null
+++ b/src/action_search_json.h
@@ -0,0 +1,7 @@
+#ifndef ACTION_SEARCH_JSON
+#define ACTION_SEARCH_JSON 1
+
+int action_search_json (void);
+
+#endif /* ACTION_SEARCH_JSON */
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/src/main.c b/src/main.c
index 5c2b146f9245b9da1903bf29fcbee458b588b37b..13add0033704d1dc36cbad22170bfa9b8165354f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,6 +15,7 @@
 
 #include "action_graph.h"
 #include "action_list_graphs.h"
+#include "action_search_json.h"
 
 /* Include this last, so the macro magic of <fcgi_stdio.h> doesn't interfere
  * with our own header files. */
@@ -34,6 +35,7 @@ static const action_t actions[] =
 {
   { "graph",       action_graph },
   { "list_graphs", action_list_graphs },
+  { "search_json", action_search_json },
   { "usage",       action_usage }
 };
 static const size_t actions_num = sizeof (actions) / sizeof (actions[0]);