X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.h;h=d303a8515e728c9e961bf95c69097473cb98e468;hb=c3e2812ad41146fc003f8a74dd8495e88047b873;hp=98014c556b94f917e0030f1add1f4a9116c6340c;hpb=dc45c37c2c3fe9ae46e3bbbc46654eba0c2672e6;p=collection4.git

diff --git a/src/graph.h b/src/graph.h
index 98014c5..d303a85 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -2,6 +2,7 @@
 #define GRAPH_H 1
 
 #include "graph_types.h"
+#include "graph_ident.h"
 #include "oconfig.h"
 #include "utils_array.h"
 
@@ -19,20 +20,39 @@ int graph_add_file (graph_config_t *cfg, const graph_ident_t *file);
 int graph_get_title (graph_config_t *cfg,
     char *buffer, size_t buffer_size);
 
-graph_ident_t *graph_get_selector (graph_config_t *cfg);
+int graph_get_params (graph_config_t *cfg, char *buffer, size_t buffer_size);
 
-graph_instance_t *graph_get_instances (graph_config_t *cfg);
+graph_ident_t *graph_get_selector (graph_config_t *cfg);
 
 graph_def_t *graph_get_defs (graph_config_t *cfg);
 
 int graph_add_def (graph_config_t *cfg, graph_def_t *def);
 
-_Bool graph_matches (graph_config_t *cfg, const graph_ident_t *ident);
+_Bool graph_matches_ident (graph_config_t *cfg, const graph_ident_t *ident);
+
+/* 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);
 
 int graph_inst_foreach (graph_config_t *cfg,
-		inst_callback_t cb, void *user_data);
+    inst_callback_t cb, void *user_data);
+
+graph_instance_t *graph_inst_find_exact (graph_config_t *cfg,
+    graph_ident_t *ident);
+
+graph_instance_t *graph_inst_find_matching (graph_config_t *cfg,
+    const graph_ident_t *ident);
+
+int graph_inst_search (graph_config_t *cfg, const char *term,
+    graph_inst_callback_t callback, void *user_data);
 
-int graph_search (graph_config_t *cfg, const char *term,
+/* Iterates over all instances and calls "inst_matches_field". If that method
+ * returns true, calls the callback with the graph and instance pointers. */
+int graph_inst_search_field (graph_config_t *cfg,
+    graph_ident_field_t field, const char *field_value,
     graph_inst_callback_t callback, void *user_data);
 
 int graph_compare (graph_config_t *cfg, const graph_ident_t *ident);