X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.c;h=2c1afc8eb0f5e060e896b35b8e0a2932dd63eac6;hb=9cf5f9b6aac4ad0f2d164ba95698e9f1dfc9a8ea;hp=66dbd47207e377211457c7e1bf0b24cb78e92288;hpb=50d5299ef04975d005f86a0ec8a0556969129cd1;p=collection4.git

diff --git a/src/graph.c b/src/graph.c
index 66dbd47..2c1afc8 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -318,6 +318,17 @@ _Bool graph_matches_ident (graph_config_t *cfg, /* {{{ */
   return (ident_matches (selector, cfg->select));
 } /* }}} _Bool graph_matches_ident */
 
+_Bool graph_ident_intersect (graph_config_t *cfg, /* {{{ */
+    const graph_ident_t *selector)
+{
+#if C4_DEBUG
+  if ((cfg == NULL) || (selector == NULL))
+    return (0);
+#endif
+
+  return (ident_intersect (cfg->select, selector));
+} /* }}} _Bool graph_ident_intersect */
+
 _Bool graph_matches_field (graph_config_t *cfg, /* {{{ */
     graph_ident_field_t field, const char *field_value)
 {
@@ -408,6 +419,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)