src/graph.[ch]: Implement "graph_search_inst".

diff --git a/src/graph.c b/src/graph.c
index 66dbd47207e377211457c7e1bf0b24cb78e92288..c6fb44446849f6fe0def7a2e2bc02bc7852a2cc9 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -408,6 +408,61 @@ int graph_inst_find_all_matching (graph_config_t *cfg, /* {{{ */
   return (0);
 } /* }}} int graph_inst_find_all_matching */
 
+/* When this function is called from graph_list, it will already have checked
+ * that the selector of the graph matches the field selections contained in
+ * the search_info_t. So if the graphs title matches, this means that the
+ * field selections and the search term(s) apply to the graph in general; thus
+ * we return all instances. Otherwise, use the somewhat expensive
+ * "search_graph_inst_matches" function to look for matching instances. */
+int graph_search_inst (graph_config_t *cfg, search_info_t *si, /* {{{ */
+    graph_inst_callback_t cb,
+    void *user_data)
+{
+  char title[1024];
+  int status;
+  size_t i;
+
+  if ((cfg == NULL) || (si == NULL) || (cb == NULL))
+    return (EINVAL);
+
+  status = graph_get_title (cfg, title, sizeof (title));
+  if (status != 0)
+  {
+    fprintf (stderr, "graph_search_inst: graph_get_title failed\n");
+    return (status);
+  }
+  strtolower (title);
+
+  if (search_graph_title_matches (si, title))
+  {
+    /* The title of the graph matches, so return all instances. */
+    for (i = 0; i < cfg->instances_num; i++)
+    {
+      status = (*cb) (cfg, cfg->instances[i], user_data);
+      if (status != 0)
+        return (status);
+    }
+  }
+  else
+  {
+    /* The title doesn't match, so use the more expensive
+     * "search_graph_inst_matches" to look for matching instances. Since part
+     * of the terms may match the title and other terms may match the
+     * instance, the title must be passed along to that function again. */
+    for (i = 0; i < cfg->instances_num; i++)
+    {
+      if (search_graph_inst_matches (si, cfg, cfg->instances[i], title))
+      {
+        status = (*cb) (cfg, cfg->instances[i], user_data);
+        if (status != 0)
+          return (status);
+      }
+    }
+  }
+
+  return (0);
+} /* }}} int graph_search_inst */
+
 int graph_search_inst_string (graph_config_t *cfg, const char *term, /* {{{ */
     graph_inst_callback_t cb,
     void *user_data)

diff --git a/src/graph.h b/src/graph.h
index 30a589fc9511dd46c6461ccf2d50153675406be7..b7a7a8919e0ac93d6a238d57229f52758c1fdb78 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
@@ -29,6 +29,7 @@
 #include "oconfig.h"
 #include "rrd_args.h"
 #include "utils_array.h"
+#include "utils_search.h"
 
 /*
  * Functions
@@ -61,10 +62,10 @@ _Bool graph_ident_matches (graph_config_t *cfg, const graph_ident_t *ident);
 _Bool graph_matches_ident (graph_config_t *cfg,
     const graph_ident_t *selector);
 
-/* Compares the given string with the appropriate field of the selector. If the
- * selector field is "/all/" or "/any/", returns true without checking the
- * instances. See "graph_inst_search_field" for finding all matching instances.
- * */
+/* Compares the given string with the appropriate field of the selector. If
+ * the selector field is "/all/" or "/any/", returns true without checking the
+ * instances. See "graph_inst_search_field" for finding all matching
+ * instances. */
 _Bool graph_matches_field (graph_config_t *cfg,
     graph_ident_field_t field, const char *field_value);
 
@@ -81,6 +82,12 @@ int graph_inst_find_all_matching (graph_config_t *cfg,
     const graph_ident_t *ident,
     graph_inst_callback_t callback, void *user_data);
 
+/* Search for instances using a search_info_t. The code assumes that the
+ * graph's selector has already been checked against the search_info_t, using
+ * "search_to_ident" and "graph_matches_ident". */
+int graph_search_inst (graph_config_t *cfg, search_info_t *si,
+    graph_inst_callback_t callback, void *user_data);
+
 int graph_search_inst_string (graph_config_t *cfg, const char *term,
     graph_inst_callback_t callback, void *user_data);