diff --git a/src/graph.c b/src/graph.c
index c6fb44446849f6fe0def7a2e2bc02bc7852a2cc9..544a606d80cf06b1d2d728650e5cde56e6cf74ed 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
return (0);
} /* }}} graph_config_add */
+int graph_add_inst (graph_config_t *graph, graph_instance_t *inst) /* {{{ */
+{
+ graph_instance_t **tmp;
+
+ if ((graph == NULL) || (inst == NULL))
+ return (EINVAL);
+
+ tmp = realloc (graph->instances,
+ sizeof (*graph->instances) * (graph->instances_num + 1));
+ if (tmp == NULL)
+ return (ENOMEM);
+ graph->instances = tmp;
+
+ graph->instances[graph->instances_num] = inst;
+ graph->instances_num++;
+
+ return (0);
+} /* }}} int graph_add_inst */
+
int graph_add_file (graph_config_t *cfg, const graph_ident_t *file) /* {{{ */
{
graph_instance_t *inst;
inst = graph_inst_find_matching (cfg, file);
if (inst == NULL)
{
- graph_instance_t **tmp;
-
- tmp = realloc (cfg->instances,
- sizeof (*cfg->instances) * (cfg->instances_num + 1));
- if (tmp == NULL)
- return (ENOMEM);
- cfg->instances = tmp;
-
inst = inst_create (cfg, file);
if (inst == NULL)
return (ENOMEM);
- cfg->instances[cfg->instances_num] = inst;
- cfg->instances_num++;
+ graph_add_inst (cfg, inst);
}
return (inst_add_file (inst, file));
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)
{
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)
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 */
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 (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 *) "title",
+ (unsigned int) strlen ("title"));
+ yajl_gen_string (handler,
+ (unsigned char *) cfg->title,
+ (unsigned int) strlen (cfg->title));
+
+ 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);
+} /* }}} int graph_to_json */
+
+int graph_def_to_json (graph_config_t *cfg, /* {{{ */
+ graph_instance_t *inst,
+ yajl_gen handler)
+{
+#define yajl_gen_string_cast(h,p,l) \
+ yajl_gen_string (h, (unsigned char *) p, (unsigned int) l)
+
+ if ((cfg == NULL) || (handler == NULL))
+ return (EINVAL);
+
+ yajl_gen_map_open (handler);
+
+ yajl_gen_string_cast (handler, "select", strlen ("select"));
+ ident_to_json (cfg->select, handler);
+ if (cfg->title != NULL)
+ {
+ yajl_gen_string_cast (handler, "title", strlen ("title"));
+ yajl_gen_string_cast (handler, cfg->title, strlen (cfg->title));
+ }
+ if (cfg->vertical_label != NULL)
+ {
+ yajl_gen_string_cast (handler, "vertical_label", strlen ("vertical_label"));
+ yajl_gen_string_cast (handler, cfg->vertical_label, strlen (cfg->vertical_label));
+ }
+ yajl_gen_string_cast (handler, "show_zero", strlen ("show_zero"));
+ yajl_gen_bool (handler, cfg->show_zero);
+
+ yajl_gen_string_cast (handler, "defs", strlen ("defs"));
+ if (cfg->defs == NULL)
+ {
+ graph_def_t *defs;
+
+ defs = inst_get_default_defs (cfg, inst);
+ def_to_json (defs, handler);
+ def_destroy (defs);
+ }
+ else
+ {
+ def_to_json (cfg->defs, handler);
+ }
+
+ yajl_gen_map_close (handler);
+
+ return (0);
+#undef yajl_gen_string_cast
+} /* }}} int graph_def_to_json */
+
+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)