X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.c;h=b654a1f30e26edb3f8fa4983c028f23c9095d3a7;hb=37a37e44591bcec0c89bddff98da60aeb48c6721;hp=c6fb44446849f6fe0def7a2e2bc02bc7852a2cc9;hpb=b31c5fd56bfb8ccf78f67d952d97c1f83b883b78;p=collection4.git

diff --git a/src/graph.c b/src/graph.c
index c6fb444..b654a1f 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,12 +419,44 @@ int graph_inst_find_all_matching (graph_config_t *cfg, /* {{{ */
   return (0);
 } /* }}} int graph_inst_find_all_matching */
 
+/* Lightweight variant of the "graph_search_inst" which is used if the
+ * search_info_t doesn't select any field values explicitely. */
+static int graph_search_inst_noselector (graph_config_t *cfg, /* {{{ */
+    search_info_t *si, graph_inst_callback_t cb, void *user_data)
+{
+  char title[1024];
+  int status;
+  size_t i;
+
+  /* parameters have already been checked in "graph_search_inst" */
+
+  status = graph_get_title (cfg, title, sizeof (title));
+  if (status != 0)
+  {
+    fprintf (stderr, "graph_search_inst_noselector: "
+        "graph_get_title failed\n");
+    return (status);
+  }
+  strtolower (title);
+
+  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);
+    }
+  } /* for (cfg->instances_num) */
+
+  return (0);
+} /* }}} int graph_search_inst_noselector */
+
 /* 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. */
+ * that the selector of the graph does not contradict the field selections contained in
+ * the search_info_t. We still have to check if the instance contradicts the
+ * search parameters, though, since the "ANY" wildcard is filled in now -
+ * possibly with contradicting values. */
 int graph_search_inst (graph_config_t *cfg, search_info_t *si, /* {{{ */
     graph_inst_callback_t cb,
     void *user_data)
@@ -421,45 +464,58 @@ int graph_search_inst (graph_config_t *cfg, search_info_t *si, /* {{{ */
   char title[1024];
   int status;
   size_t i;
+  graph_ident_t *search_selector;
 
   if ((cfg == NULL) || (si == NULL) || (cb == NULL))
     return (EINVAL);
 
+  if (!search_has_selector (si))
+    return (graph_search_inst_noselector (cfg, si, cb, user_data));
+
+  search_selector = search_to_ident (si);
+  if (search_selector == NULL)
+    return (ENOMEM);
+
   status = graph_get_title (cfg, title, sizeof (title));
   if (status != 0)
   {
+    ident_destroy (search_selector);
     fprintf (stderr, "graph_search_inst: graph_get_title failed\n");
     return (status);
   }
   strtolower (title);
 
-  if (search_graph_title_matches (si, title))
+  for (i = 0; i < cfg->instances_num; i++)
   {
-    /* The title of the graph matches, so return all instances. */
-    for (i = 0; i < cfg->instances_num; i++)
+    graph_ident_t *inst_selector;
+
+    inst_selector = inst_get_selector (cfg->instances[i]);
+    if (inst_selector == NULL)
+      continue;
+
+    /* If the two selectors contradict one another, there is no point in
+     * calling the (more costly) "search_graph_inst_matches" function. */
+    if (!ident_intersect (search_selector, inst_selector))
     {
-      status = (*cb) (cfg, cfg->instances[i], user_data);
-      if (status != 0)
-        return (status);
+      ident_destroy (inst_selector);
+      continue;
     }
-  }
-  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))
     {
-      if (search_graph_inst_matches (si, cfg, cfg->instances[i], title))
+      status = (*cb) (cfg, cfg->instances[i], user_data);
+      if (status != 0)
       {
-        status = (*cb) (cfg, cfg->instances[i], user_data);
-        if (status != 0)
-          return (status);
+        ident_destroy (search_selector);
+        ident_destroy (inst_selector);
+        return (status);
       }
     }
-  }
 
+    ident_destroy (inst_selector);
+  } /* for (cfg->instances_num) */
+
+  ident_destroy (search_selector);
   return (0);
 } /* }}} int graph_search_inst */
 
@@ -550,12 +606,6 @@ int graph_compare (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
   return (ident_compare (cfg->select, ident));
 } /* }}} int graph_compare */
 
-static int graph_sort_instances_cb (const void *v0, const void *v1) /* {{{ */
-{
-  return (inst_compare (*(graph_instance_t * const *) v0,
-        *(graph_instance_t * const *) v1));
-} /* }}} int graph_sort_instances_cb */
-
 size_t graph_num_instances (graph_config_t *cfg) /* {{{ */
 {
   if (cfg == NULL)
@@ -564,6 +614,37 @@ size_t graph_num_instances (graph_config_t *cfg) /* {{{ */
   return (cfg->instances_num);
 } /* }}} size_t graph_num_instances */
 
+int graph_to_json (const graph_config_t *cfg,
+    yajl_gen handler)
+{
+  size_t i;
+
+  if ((cfg == NULL) || (handler == NULL))
+    return (EINVAL);
+
+  yajl_gen_map_open (handler);
+  yajl_gen_string (handler,
+      (unsigned char *) "select",
+      (unsigned int) strlen ("select"));
+  ident_to_json (cfg->select, handler);
+  yajl_gen_string (handler,
+      (unsigned char *) "instances",
+      (unsigned int) strlen ("instances"));
+  yajl_gen_array_open (handler);
+  for (i = 0; i < cfg->instances_num; i++)
+    inst_to_json (cfg->instances[i], handler);
+  yajl_gen_array_close (handler);
+  yajl_gen_map_close (handler);
+
+  return (0);
+}
+
+static int graph_sort_instances_cb (const void *v0, const void *v1) /* {{{ */
+{
+  return (inst_compare (*(graph_instance_t * const *) v0,
+        *(graph_instance_t * const *) v1));
+} /* }}} int graph_sort_instances_cb */
+
 int graph_sort_instances (graph_config_t *cfg) /* {{{ */
 {
   if (cfg == NULL)