X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faction_list_graphs.c;h=f00c6b3bb919e62c91120a224e673474e9336c0a;hb=7ef6ca1ae6310242938b74bd1e79c51e4373534f;hp=964a436c53ef6435850a43a62f146c29e7f03c6c;hpb=f2f5199194d22cd15681fdf02469dce4445f3d14;p=collection4.git

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index 964a436..f00c6b3 100644
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -12,64 +12,126 @@
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
 
-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");
 
-  printf ("Content-Type: application/json\n\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 = 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)
@@ -87,7 +149,8 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
     graph_get_title (cfg, desc, sizeof (desc));
     html_escape_buffer (desc, sizeof (desc));
 
-    printf ("  <li>%s\n  <ul>\n", desc);
+    printf ("  <li class=\"graph\">%s\n"
+        "  <ul class=\"instance_list\">\n", desc);
 
     data->cfg = cfg;
   }
@@ -100,7 +163,7 @@ static int print_graph_inst_html (graph_config_t *cfg, /* {{{ */
   inst_describe (cfg, inst, desc, sizeof (desc));
   html_escape_buffer (desc, sizeof (desc));
 
-  printf ("    <li><a href=\"%s?action=graph;%s\">%s</a></li>\n",
+  printf ("    <li class=\"instance\"><a href=\"%s?action=graph;%s\">%s</a></li>\n",
       script_name (), params, desc);
 
   if (data->limit > 0)
@@ -115,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;
@@ -129,18 +192,23 @@ static int list_graphs_html (const char *term) /* {{{ */
     printf ("    <title>c4: Graphs matching &quot;%s&quot;</title>\n", term);
   else
     printf ("    <title>c4: List of all graphs</title>\n");
+  printf ("    <link rel=\"stylesheet\" type=\"text/css\" href=\"../share/style.css\" />\n");
+  printf ("    <script type=\"text/javascript\" src=\"../share/jquery-1.4.2.min.js\">\n"
+      "    </script>\n"
+      "    <script type=\"text/javascript\" src=\"../share/collection.js\">\n"
+      "    </script>\n");
   printf ("  </head>\n  <body>\n");
 
   printf ("<form action=\"%s\" method=\"get\">\n"
       "  <input type=\"hidden\" name=\"action\" value=\"list_graphs\" />\n"
-      "  <input type=\"text\" name=\"search\" value=\"%s\" />\n"
+      "  <input type=\"text\" name=\"search\" value=\"%s\" id=\"search-input\" />\n"
       "  <input type=\"submit\" name=\"button\" value=\"Search\" />\n"
       "</form>\n",
       script_name (), (term_html != NULL) ? term_html : "");
 
   free (term_html);
 
-  printf ("    <ul>\n");
+  printf ("    <ul id=\"search-output\" class=\"graph_list\">\n");
   if (term == NULL)
     gl_instance_get_all (print_graph_inst_html, /* user_data = */ &data);
   else
@@ -159,17 +227,25 @@ static int list_graphs_html (const char *term) /* {{{ */
 int action_list_graphs (void) /* {{{ */
 {
   const char *format;
+  const char *search;
+  int status;
 
   gl_update ();
 
+  search = strtolower_copy (param ("search"));
+
   format = param ("format");
   if (format == NULL)
     format = "html";
 
   if (strcmp ("json", format) == 0)
-    return (list_graphs_json ());
+    status = list_graphs_json (search);
   else
-    return (list_graphs_html (param ("search")));
+    status = list_graphs_html (search);
+
+  free (search);
+
+  return (status);
 } /* }}} int action_list_graphs */
 
 /* vim: set sw=2 sts=2 et fdm=marker : */