X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_list.c;h=26e182bdc7bd8b6a9f89db82d6395ec50919bfbe;hb=49e41ab84a7719050ada26760b0184180f085b55;hp=ef52cb362106092ed9de51115b5edb4d85d4b9db;hpb=f0aa70e4541cd0dd36a436617e7357b3861fe4ba;p=collection4.git

diff --git a/src/graph_list.c b/src/graph_list.c
index ef52cb3..26e182b 100644
--- a/src/graph_list.c
+++ b/src/graph_list.c
@@ -37,6 +37,7 @@
 #include "graph_def.h"
 #include "graph_ident.h"
 #include "utils_cgi.h"
+#include "utils_search.h"
 
 #include <fcgiapp.h>
 #include <fcgi_stdio.h>
@@ -173,7 +174,7 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */
     graph_config_t *cfg = gl_active[i];
     int status;
 
-    if (!graph_matches_ident (cfg, file))
+    if (!graph_ident_matches (cfg, file))
       continue;
 
     status = graph_add_file (cfg, file);
@@ -221,6 +222,51 @@ static int gl_clear_instances (void) /* {{{ */
   return (0);
 } /* }}} int gl_clear_instances */
 
+static void gl_dump_cb (void *ctx, /* {{{ */
+    const char *str, unsigned int len)
+{
+  FILE *fh = ctx;
+
+  /* FIXME: Has everything been written? */
+  fwrite ((void *) str, /* size = */ 1, /* nmemb = */ len, fh);
+} /* }}} void gl_dump_cb */
+
+static int gl_dump (void) /* {{{ */
+{
+  FILE *fh;
+  yajl_gen handler;
+  yajl_gen_config handler_config = { /* pretty = */ 1, /* indent = */ "  " };
+  size_t i;
+
+  /* FIXME: Lock the file */
+  fh = fopen ("/tmp/collection4.json", "w");
+  if (fh == NULL)
+    return (errno);
+
+  handler = yajl_gen_alloc2 (gl_dump_cb, &handler_config,
+      /* alloc funcs = */ NULL, /* ctx = */ fh);
+  if (handler == NULL)
+  {
+    fclose (fh);
+    return (-1);
+  }
+
+  yajl_gen_array_open (handler);
+
+  for (i = 0; i < gl_active_num; i++)
+    graph_to_json (gl_active[i], handler);
+
+  for (i = 0; i < gl_dynamic_num; i++)
+    graph_to_json (gl_dynamic[i], handler);
+
+  yajl_gen_array_close (handler);
+
+  yajl_gen_free (handler);
+  fclose (fh);
+
+  return (0);
+} /* }}} int gl_dump */
+
 /*
  * Global functions
  */
@@ -381,6 +427,60 @@ int gl_instance_get_all (graph_inst_callback_t callback, /* {{{ */
 } /* }}} int gl_instance_get_all */
 /* }}} gl_instance_get_all, gl_graph_instance_get_all */
 
+int gl_search (search_info_t *si, /* {{{ */
+    graph_inst_callback_t callback, void *user_data)
+{
+  size_t i;
+  graph_ident_t *ident;
+
+  if ((si == NULL) || (callback == NULL))
+    return (EINVAL);
+
+  if (search_has_selector (si))
+  {
+    ident = search_to_ident (si);
+    if (ident == NULL)
+    {
+      fprintf (stderr, "gl_search: search_to_ident failed\n");
+      return (-1);
+    }
+  }
+  else
+  {
+    ident = NULL;
+  }
+
+  for (i = 0; i < gl_active_num; i++)
+  {
+    int status;
+
+    if ((ident != NULL) && !graph_ident_intersect (gl_active[i], ident))
+      continue;
+
+    status = graph_search_inst (gl_active[i], si,
+        /* callback  = */ callback,
+        /* user data = */ user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  for (i = 0; i < gl_dynamic_num; i++)
+  {
+    int status;
+
+    if ((ident != NULL) && !graph_ident_intersect (gl_dynamic[i], ident))
+      continue;
+
+    status = graph_search_inst (gl_dynamic[i], si,
+        /* callback  = */ callback,
+        /* user data = */ user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int gl_search */
+
 int gl_search_string (const char *term, graph_inst_callback_t callback, /* {{{ */
     void *user_data)
 {
@@ -390,7 +490,7 @@ int gl_search_string (const char *term, graph_inst_callback_t callback, /* {{{ *
   {
     int status;
 
-    status = graph_inst_search (gl_active[i], term,
+    status = graph_search_inst_string (gl_active[i], term,
         /* callback  = */ callback,
         /* user data = */ user_data);
     if (status != 0)
@@ -401,7 +501,7 @@ int gl_search_string (const char *term, graph_inst_callback_t callback, /* {{{ *
   {
     int status;
 
-    status = graph_inst_search (gl_dynamic[i], term,
+    status = graph_search_inst_string (gl_dynamic[i], term,
         /* callback  = */ callback,
         /* user data = */ user_data);
     if (status != 0)
@@ -496,6 +596,8 @@ int gl_update (void) /* {{{ */
   for (i = 0; i < gl_active_num; i++)
     graph_sort_instances (gl_active[i]);
 
+  gl_dump ();
+
   return (status);
 } /* }}} int gl_update */