X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Finclude%2Fcore%2Fstore.h;h=94a571345852481b89479fd6664f2fc484c103b9;hp=e83ff8486ebcf2a8d21a49a9c8da87ddeceba9ec;hb=da52b4da948c741d20c7a3995ce5d133af377def;hpb=47a1228872b3df692d8b17b7b85d1a863faf4fd7

diff --git a/src/include/core/store.h b/src/include/core/store.h
index e83ff84..94a5713 100644
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
@@ -60,6 +60,7 @@ enum {
 	SDB_FIELD_AGE,           /* type: datetime */
 	SDB_FIELD_INTERVAL,      /* type: datetime */
 	SDB_FIELD_BACKEND,       /* type: array of strings */
+	SDB_FIELD_VALUE,         /* attributes only;  type: type of the value */
 };
 #define SDB_STORE_TYPE_TO_NAME(t) \
 	(((t) == SDB_HOST) ? "host" \
@@ -76,7 +77,9 @@ enum {
 		: ((f) == SDB_FIELD_LAST_UPDATE) ? "last-update" \
 		: ((f) == SDB_FIELD_AGE) ? "age" \
 		: ((f) == SDB_FIELD_INTERVAL) ? "interval" \
-		: ((f) == SDB_FIELD_BACKEND) ? "backend" : "unknown")
+		: ((f) == SDB_FIELD_BACKEND) ? "backend" \
+		: ((f) == SDB_FIELD_VALUE) ? "value" \
+		: "unknown")
 
 #define SDB_FIELD_TYPE(f) \
 	(((f) == SDB_FIELD_NAME) ? SDB_TYPE_STRING \
@@ -84,6 +87,7 @@ enum {
 		: ((f) == SDB_FIELD_AGE) ? SDB_TYPE_DATETIME \
 		: ((f) == SDB_FIELD_INTERVAL) ? SDB_TYPE_DATETIME \
 		: ((f) == SDB_FIELD_BACKEND) ? (SDB_TYPE_ARRAY | SDB_TYPE_STRING) \
+		: ((f) == SDB_FIELD_VALUE) ? -1 /* unknown */ \
 		: -1)
 
 /*
@@ -483,19 +487,21 @@ sdb_store_inv_matcher(sdb_store_matcher_t *m);
 
 /*
  * sdb_store_any_matcher:
- * Creates a matcher iterating over objects of the specified type. It matches
- * if *any* of those objects match 'm'.
+ * Creates a matcher iterating over values of the first expression (which has
+ * to be iterable). It matches if *any* of those elements match 'm'. 'm' has
+ * to be an ary operation with the left operand unset.
  */
 sdb_store_matcher_t *
-sdb_store_any_matcher(int type, sdb_store_matcher_t *m);
+sdb_store_any_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m);
 
 /*
  * sdb_store_all_matcher:
- * Creates a matcher iterating over objects of the specified type. It matches
- * if *all* of those objects match 'm'.
+ * Creates a matcher iterating over values of the first expression (which has
+ * to be iterable). It matches if *all* of those elements match 'm'. 'm' has
+ * to be an ary operation with the left operand unset.
  */
 sdb_store_matcher_t *
-sdb_store_all_matcher(int type, sdb_store_matcher_t *m);
+sdb_store_all_matcher(sdb_store_expr_t *iter, sdb_store_matcher_t *m);
 
 /*
  * sdb_store_in_matcher: