store_lookup: Removed the (now unused) host matcher.

[sysdb.git] / src / include / core / store.h

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 6106b3fdbe2490629a6b1e42d02ee85184d134dc..890482a965ffe0b119603d7fcf728fe790c71a6f 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -41,6 +41,20 @@
 extern "C" {
 #endif
 
+/*
+ * Store object types.
+ */
+enum {
+       SDB_HOST = 1,
+       SDB_SERVICE,
+       SDB_ATTRIBUTE,
+};
+#define SDB_STORE_TYPE_TO_NAME(t) \
+       (((t) == SDB_HOST) ? "host" \
+               : ((t) == SDB_SERVICE) ? "service" \
+               : ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
+
+
 /*
  * sdb_store_base_t represents the super-class of any object stored in the
  * database. It inherits from sdb_object_t and may safely be cast to a generic
@@ -128,9 +142,10 @@ sdb_store_service(const char *hostname, const char *name,
                sdb_time_t last_update);
 
 /*
- * Store matchers may be used to lookup objects from the host based on their
- * various attributes. Each type of matcher evaluates attributes of the
- * respective object type.
+ * Store matchers may be used to lookup hosts from the store based on their
+ * various attributes. Service and attribute matchers are applied to a host's
+ * services and attributes and evaluate to true if *any* service or attribute
+ * matches.
  *
  * For each matcher object, *all* specified attributes have to match.
  *
@@ -142,32 +157,22 @@ typedef struct sdb_store_matcher sdb_store_matcher_t;
 #define SDB_STORE_MATCHER(obj) ((sdb_store_matcher_t *)(obj))
 
 /*
- * sdb_store_attr_matcher:
- * Creates a matcher matching attributes based on their name or value. Either
- * a complete name (which will have to match completely but case-independent)
- * or an extended POSIX regular expression may be specified.
- */
-sdb_store_matcher_t *
-sdb_store_attr_matcher(const char *attr_name, const char *attr_name_re,
-               const char *attr_value, const char *attr_value_re);
-
-/*
- * sdb_store_service_matcher:
- * Creates a matcher matching services based on their name or attributes.
+ * sdb_store_name_matcher:
+ * Creates a matcher matching by the specified object type's name. If 're' is
+ * true, the specified name is treated as a POSIX extended regular expression.
+ * Else, the exact name has to match (case-insensitive).
  */
 sdb_store_matcher_t *
-sdb_store_service_matcher(const char *service_name, const char *service_name_re,
-               sdb_store_matcher_t *attr_matcher);
+sdb_store_name_matcher(int type, const char *name, _Bool re);
 
 /*
- * sdb_store_host_matcher:
- * Creates a matcher matching hosts based on their name, services assigned to
- * the host, or its attributes.
+ * sdb_store_attr_matcher:
+ * Creates a matcher matching attributes based on their value. If 're' is
+ * true, the specified name is treated as a POSIX extended regular expression.
+ * Else, the exact name has to match (case-insensitive).
  */
 sdb_store_matcher_t *
-sdb_store_host_matcher(const char *host_name, const char *host_name_re,
-               sdb_store_matcher_t *service_matcher,
-               sdb_store_matcher_t *attr_matcher);
+sdb_store_attr_matcher(const char *name, const char *value, _Bool re);
 
 /*
  * sdb_store_matcher_parse_cmp: