diff --git a/src/utils_search.c b/src/utils_search.c
index ba5927be18e4dee45b4654898e75691f2350393e..84c9035609fa26452c219c7993b1ddfbe1c7456f 100644 (file)
--- a/src/utils_search.c
+++ b/src/utils_search.c
#include <errno.h>
#include "utils_search.h"
+#include "graph_ident.h"
#include "graph_instance.h"
#include "utils_array.h"
char *token;
search_info_t *si;
+ if (search == NULL)
+ return (NULL);
+
si = malloc (sizeof (*si));
if (si == NULL)
return (NULL);
array_destroy (si->terms);
} /* }}} void search_destroy */
+_Bool search_has_selector (search_info_t *si) /* {{{ */
+{
+ if (si == NULL)
+ return (0);
+
+ if ((si->host != NULL)
+ || (si->plugin != NULL) || (si->plugin_instance != NULL)
+ || (si->type != NULL) || (si->type_instance != NULL))
+ return (1);
+
+ return (0);
+} /* }}} _Bool search_has_selector */
+
+graph_ident_t *search_to_ident (search_info_t *si) /* {{{ */
+{
+ if (si == NULL)
+ return (NULL);
+
+ return (ident_create ((si->host == NULL) ? ANY_TOKEN : si->host,
+ (si->plugin == NULL) ? ANY_TOKEN : si->plugin,
+ (si->plugin_instance == NULL) ? ANY_TOKEN : si->plugin_instance,
+ (si->type == NULL) ? ANY_TOKEN : si->type,
+ (si->type_instance == NULL) ? ANY_TOKEN : si->type_instance));
+} /* }}} graph_ident_t *search_to_ident */
+
+search_info_t *search_from_ident (const graph_ident_t *ident) /* {{{ */
+{
+ search_info_t *si;
+
+ if (ident == NULL)
+ return (NULL);
+
+ si = malloc (sizeof (*si));
+ if (si == NULL)
+ return (NULL);
+ memset (si, 0, sizeof (*si));
+ si->terms = NULL;
+
+#define COPY_FIELD(f) do { \
+ const char *tmp = ident_get_##f (ident); \
+ if (tmp == NULL) \
+ si->f = NULL; \
+ else \
+ si->f = strdup (tmp); \
+} while (0)
+
+ COPY_FIELD(host);
+ COPY_FIELD(plugin);
+ COPY_FIELD(plugin_instance);
+ COPY_FIELD(type);
+ COPY_FIELD(type_instance);
+
+#undef COPY_FIELD
+
+ return (si);
+} /* }}} search_info_t *search_from_ident */
+
+_Bool search_graph_title_matches (search_info_t *si, /* {{{ */
+ const char *title)
+{
+ char **argv;
+ int argc;
+ int i;
+
+ if ((si == NULL) || (title == NULL))
+ return (0);
+
+ if (si->terms == NULL)
+ return (1);
+
+ argc = array_argc (si->terms);
+ argv = array_argv (si->terms);
+ for (i = 0; i < argc; i++)
+ if (strstr (title, argv[i]) == NULL)
+ return (0);
+
+ return (1);
+} /* }}} _Bool search_graph_title_matches */
+
_Bool search_graph_inst_matches (search_info_t *si, /* {{{ */
- graph_config_t *cfg, graph_instance_t *inst)
+ graph_config_t *cfg, graph_instance_t *inst,
+ const char *title)
{
char **argv;
int argc;
argc = array_argc (si->terms);
argv = array_argv (si->terms);
for (i = 0; i < argc; i++)
- if (!inst_matches_string (cfg, inst, argv[i]))
- return (0);
+ {
+ if (inst_matches_string (cfg, inst, argv[i]))
+ continue;
+
+ if ((title != NULL) && (strstr (title, argv[i]) != NULL))
+ continue;
+
+ return (0);
+ }
return (1);
} /* }}} _Bool search_graph_inst_matches */