X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph.c;h=2c1afc8eb0f5e060e896b35b8e0a2932dd63eac6;hb=9cf5f9b6aac4ad0f2d164ba95698e9f1dfc9a8ea;hp=8d12a25a1606d397d4ac20e66cb91fe9b45af9ee;hpb=8a3753760230b270c8f4615891cba2586a661d21;p=collection4.git diff --git a/src/graph.c b/src/graph.c index 8d12a25..2c1afc8 100644 --- a/src/graph.c +++ b/src/graph.c @@ -1,3 +1,26 @@ +/** + * collection4 - graph.c + * Copyright (C) 2010 Florian octo Forster + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + * + * Authors: + * Florian octo Forster + **/ + #include #include #include @@ -256,6 +279,8 @@ graph_def_t *graph_get_defs (graph_config_t *cfg) /* {{{ */ int graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */ { + graph_def_t *tmp; + if ((cfg == NULL) || (def == NULL)) return (EINVAL); @@ -265,17 +290,45 @@ int graph_add_def (graph_config_t *cfg, graph_def_t *def) /* {{{ */ return (0); } - return (def_append (cfg->defs, def)); + /* Insert in reverse order. This makes the order in the config file and the + * order of the DEFs in the graph more natural. Really. */ + tmp = cfg->defs; + cfg->defs = def; + 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)) return (0); +#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_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) { @@ -366,7 +419,62 @@ int graph_inst_find_all_matching (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) { @@ -377,7 +485,7 @@ int graph_inst_search (graph_config_t *cfg, const char *term, /* {{{ */ 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); } @@ -406,7 +514,7 @@ int graph_inst_search (graph_config_t *cfg, const char *term, /* {{{ */ } 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, @@ -453,6 +561,34 @@ 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) + 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;