return (def_append (cfg->defs, tmp));
} /* }}} int graph_add_def */
-_Bool graph_matches_ident (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
+_Bool graph_ident_matches (graph_config_t *cfg, const graph_ident_t *ident) /* {{{ */
{
#if C4_DEBUG
if ((cfg == NULL) || (ident == NULL))
#endif
return (ident_matches (cfg->select, ident));
+} /* }}} _Bool graph_ident_matches */
+
+_Bool graph_matches_ident (graph_config_t *cfg, /* {{{ */
+ const graph_ident_t *selector)
+{
+#if C4_DEBUG
+ if ((cfg == NULL) || (selector == NULL))
+ return (0);
+#endif
+
+ return (ident_matches (selector, cfg->select));
} /* }}} _Bool graph_matches_ident */
_Bool graph_matches_field (graph_config_t *cfg, /* {{{ */
return (0);
} /* }}} int graph_inst_find_all_matching */
-int graph_inst_search (graph_config_t *cfg, const char *term, /* {{{ */
+/* 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)
{
status = graph_get_title (cfg, buffer, sizeof (buffer));
if (status != 0)
{
- fprintf (stderr, "graph_inst_search: graph_get_title failed\n");
+ fprintf (stderr, "graph_search_inst_string: graph_get_title failed\n");
return (status);
}
}
return (0);
-} /* }}} int graph_inst_search */
+} /* }}} int graph_search_inst_string */
int graph_inst_search_field (graph_config_t *cfg, /* {{{ */
graph_ident_field_t field, const char *field_value,
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)
+ return ((size_t) -1);
+
+ return (cfg->instances_num);
+} /* }}} size_t graph_num_instances */
+
+int graph_sort_instances (graph_config_t *cfg) /* {{{ */
+{
+ if (cfg == NULL)
+ return (EINVAL);
+
+ if (cfg->instances_num < 2)
+ return (0);
+
+ qsort (cfg->instances, cfg->instances_num, sizeof (*cfg->instances),
+ graph_sort_instances_cb);
+
+ return (0);
+} /* }}} int graph_sort_instances */
+
int graph_clear_instances (graph_config_t *cfg) /* {{{ */
{
size_t i;