X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fstore.h;h=59200815482e9d5540837dfd1fce07e19fdfd743;hb=f16f904e1f266e079ba6f06ae7952a11b29d5dfd;hp=68ee3aa1aae42e73212610a49eb48658b8343e9e;hpb=fcd4fcb0afee7df6ff0e9f305f9ef43445f88545;p=sysdb.git

diff --git a/src/include/core/store.h b/src/include/core/store.h
index 68ee3aa..5920081 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -141,14 +141,32 @@ int
 sdb_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update);
 
+/*
+ * Conditionals may be used to lookup hosts from the store based on a
+ * conditional expression.
+ *
+ * A conditional object inherits from sdb_object_t and, thus, may safely be
+ * cast to a generic object.
+ */
+struct sdb_store_cond;
+typedef struct sdb_store_cond sdb_store_cond_t;
+#define SDB_STORE_COND(obj) ((sdb_store_cond_t *)(obj))
+
+/*
+ * sdb_store_attr_cond:
+ * Creates a conditional based on attribute values. The value of stored
+ * attributes is compared against the specified value. See sdb_data_cmp for
+ * details about the comparison.
+ */
+sdb_store_cond_t *
+sdb_store_attr_cond(const char *name, const sdb_data_t *value);
+
 /*
  * 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.
- *
  * A store matcher object inherits from sdb_object_t and, thus, may safely be
  * cast to a generic object.
  */
@@ -160,38 +178,38 @@ typedef struct sdb_store_matcher sdb_store_matcher_t;
  * 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.
+ * Else, the exact name has to match (case-insensitive).
  */
 sdb_store_matcher_t *
 sdb_store_name_matcher(int type, const char *name, _Bool re);
 
 /*
  * 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.
+ * 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_attr_matcher(const char *attr_name, const char *attr_name_re,
-		const char *attr_value, const char *attr_value_re);
+sdb_store_attr_matcher(const char *name, const char *value, _Bool re);
 
 /*
- * sdb_store_service_matcher:
- * Creates a matcher matching services based on their name or attributes.
+ * sdb_store_lt_matcher, sdb_store_le_matcher, sdb_store_eq_matcher,
+ * sdb_store_ge_matcher, sdb_store_gt_matcher:
+ * Creates a matcher based on a conditional. The matcher matches objects for
+ * which the conditional evaluates the object to compare less than, less or
+ * equal, equal, greater or equal, or greater than the conditional's value
+ * repsectively.
  */
 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_host_matcher:
- * Creates a matcher matching hosts based on their name, services assigned to
- * the host, or its attributes.
- */
+sdb_store_lt_matcher(sdb_store_cond_t *cond);
+sdb_store_matcher_t *
+sdb_store_le_matcher(sdb_store_cond_t *cond);
+sdb_store_matcher_t *
+sdb_store_eq_matcher(sdb_store_cond_t *cond);
+sdb_store_matcher_t *
+sdb_store_ge_matcher(sdb_store_cond_t *cond);
 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_gt_matcher(sdb_store_cond_t *cond);
 
 /*
  * sdb_store_matcher_parse_cmp:
@@ -203,7 +221,7 @@ sdb_store_host_matcher(const char *host_name, const char *host_name_re,
  */
 sdb_store_matcher_t *
 sdb_store_matcher_parse_cmp(const char *obj_type, const char *attr,
-		const char *op, const char *value);
+		const char *op, const sdb_data_t *value);
 
 /*
  * sdb_store_dis_matcher: