X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_list.c;h=7164c74e01762b97c2ea3f9e11c7480d20165e53;hb=8e72ccc76582cf1f68b6e9e4816ac0bd785fc7d8;hp=ca088a9ff693bfcab4811cce74101e7f30545580;hpb=52b15cc05fd4d7cc97f20b5bc52982e5ef49647b;p=collection4.git

diff --git a/src/graph_list.c b/src/graph_list.c
index ca088a9..7164c74 100644
--- a/src/graph_list.c
+++ b/src/graph_list.c
@@ -7,11 +7,12 @@
 #include <errno.h>
 
 #include "graph_list.h"
-#include "graph_ident.h"
-#include "graph_def.h"
-#include "graph_config.h"
 #include "common.h"
 #include "filesystem.h"
+#include "graph.h"
+#include "graph_config.h"
+#include "graph_def.h"
+#include "graph_ident.h"
 #include "utils_cgi.h"
 
 #include <fcgiapp.h>
@@ -31,6 +32,9 @@ static size_t gl_active_num = 0;
 static graph_config_t **gl_staging = NULL;
 static size_t gl_staging_num = 0;
 
+static char **host_list = NULL;
+static size_t host_list_len = 0;
+
 static time_t gl_last_update = 0;
 
 /*
@@ -61,6 +65,50 @@ int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
   return (0);
 } /* }}} int gl_add_graph_internal */
 
+static int gl_register_host (const char *host) /* {{{ */
+{
+  char **tmp;
+  size_t i;
+
+  if (host == NULL)
+    return (EINVAL);
+
+  for (i = 0; i < host_list_len; i++)
+    if (strcmp (host_list[i], host) == 0)
+      return (0);
+
+  tmp = realloc (host_list, sizeof (*host_list) * (host_list_len + 1));
+  if (tmp == NULL)
+    return (ENOMEM);
+  host_list = tmp;
+
+  host_list[host_list_len] = strdup (host);
+  if (host_list[host_list_len] == NULL)
+    return (ENOMEM);
+
+  host_list_len++;
+  return (0);
+} /* }}} int gl_register_host */
+
+static int gl_clear_hosts (void) /* {{{ */
+{
+  size_t i;
+
+  for (i = 0; i < host_list_len; i++)
+    free (host_list[i]);
+  free (host_list);
+
+  host_list = NULL;
+  host_list_len = 0;
+
+  return (0);
+} /* }}} int gl_clear_hosts */
+
+static int gl_compare_hosts (const void *v0, const void *v1) /* {{{ */
+{
+  return (strcmp (v0, v1));
+} /* }}} int gl_compare_hosts */
+
 static int gl_register_file (const graph_ident_t *file, /* {{{ */
     __attribute__((unused)) void *user_data)
 {
@@ -73,7 +121,7 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */
     graph_config_t *cfg = gl_active[i];
     int status;
 
-    if (!graph_matches (cfg, file))
+    if (!graph_matches_ident (cfg, file))
       continue;
 
     status = graph_add_file (cfg, file);
@@ -94,6 +142,8 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */
     graph_add_file (cfg, file);
   }
 
+  gl_register_host (ident_get_host (file));
+
   return (0);
 } /* }}} int gl_register_file */
 
@@ -268,7 +318,7 @@ int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
   {
     int status;
 
-    status = graph_search (gl_active[i], term,
+    status = graph_inst_search (gl_active[i], term,
         /* callback  = */ callback,
         /* user data = */ user_data);
     if (status != 0)
@@ -278,6 +328,46 @@ int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
   return (0);
 } /* }}} int gl_search */
 
+int gl_search_field (graph_ident_field_t field, /* {{{ */
+    const char *field_value,
+    graph_inst_callback_t callback, void *user_data)
+{
+  size_t i;
+
+  if ((field_value == NULL) || (callback == NULL))
+    return (EINVAL);
+
+  for (i = 0; i < gl_active_num; i++)
+  {
+    int status;
+
+    status = graph_inst_search_field (gl_active[i],
+        field, field_value,
+        /* callback  = */ callback,
+        /* user data = */ user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int gl_search_field */
+
+int gl_foreach_host (int (*callback) (const char *host, void *user_data), /* {{{ */
+    void *user_data)
+{
+  int status;
+  size_t i;
+
+  for (i = 0; i < host_list_len; i++)
+  {
+    status = (*callback) (host_list[i], user_data);
+    if (status != 0)
+      return (status);
+  }
+
+  return (0);
+} /* }}} int gl_foreach_host */
+
 int gl_update (void) /* {{{ */
 {
   time_t now;
@@ -295,8 +385,13 @@ int gl_update (void) /* {{{ */
   graph_read_config ();
 
   gl_clear_instances ();
+  gl_clear_hosts ();
   status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);
 
+  if (host_list_len > 0)
+    qsort (host_list, host_list_len, sizeof (*host_list),
+        gl_compare_hosts);
+
   gl_last_update = now;
 
   return (status);