X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore-private.h;h=49ddaf547465f349b8ba57aede974e0388628652;hb=fd3e376f4c7dc24c40717c056548c4e26e4e8b97;hp=cda98357cadaa114e0af20f956f9927dc7e9cf49;hpb=fcd4fcb0afee7df6ff0e9f305f9ef43445f88545;p=sysdb.git

diff --git a/src/core/store-private.h b/src/core/store-private.h
index cda9835..49ddaf5 100644
--- a/src/core/store-private.h
+++ b/src/core/store-private.h
@@ -77,6 +77,25 @@ typedef struct {
 #define _last_update super.last_update
 #define _interval super.interval
 
+/*
+ * conditionals
+ */
+
+/* compares a store object using the specified conditional */
+typedef int (*cmp_cb)(sdb_store_base_t *, sdb_store_cond_t *);
+
+struct sdb_store_cond {
+	sdb_object_t super;
+	cmp_cb cmp;
+};
+
+typedef struct {
+	sdb_store_cond_t super;
+	char *name;
+	sdb_data_t value;
+} attr_cond_t;
+#define ATTR_C(obj) ((attr_cond_t *)(obj))
+
 /*
  * matchers
  */
@@ -89,15 +108,31 @@ enum {
 	MATCHER_NOT,
 	MATCHER_NAME,
 	MATCHER_ATTR,
-	MATCHER_SERVICE,
-	MATCHER_HOST,
+	MATCHER_LT,
+	MATCHER_LE,
+	MATCHER_EQ,
+	MATCHER_GE,
+	MATCHER_GT,
 };
 
+#define MATCHER_SYM(t) \
+	(((t) == MATCHER_OR) ? "OR" \
+		: ((t) == MATCHER_AND) ? "AND" \
+		: ((t) == MATCHER_NOT) ? "NOT" \
+		: ((t) == MATCHER_NAME) ? "NAME" \
+		: ((t) == MATCHER_ATTR) ? "ATTR" \
+		: ((t) == MATCHER_LT) ? "<" \
+		: ((t) == MATCHER_LE) ? "<=" \
+		: ((t) == MATCHER_EQ) ? "=" \
+		: ((t) == MATCHER_GE) ? ">=" \
+		: ((t) == MATCHER_GT) ? ">" \
+		: "UNKNOWN")
+
 /* match the name of something */
 typedef struct {
 	char    *name;
 	regex_t *name_re;
-} name_matcher_t;
+} string_matcher_t;
 
 /* matcher base type */
 struct sdb_store_matcher {
@@ -107,7 +142,7 @@ struct sdb_store_matcher {
 };
 #define M(m) ((sdb_store_matcher_t *)(m))
 
-/* logical infix operator matcher */
+/* infix operator matcher */
 typedef struct {
 	sdb_store_matcher_t super;
 
@@ -117,7 +152,7 @@ typedef struct {
 } op_matcher_t;
 #define OP_M(m) ((op_matcher_t *)(m))
 
-/* logical unary operator matcher */
+/* unary operator matcher */
 typedef struct {
 	sdb_store_matcher_t super;
 
@@ -131,38 +166,26 @@ typedef struct {
 	sdb_store_matcher_t super;
 
 	int obj_type;
-
-	/* match by the name of the object */
-	name_matcher_t name;
-} obj_matcher_t;
-#define OBJ_M(m) ((obj_matcher_t *)(m))
+	string_matcher_t name;
+} name_matcher_t;
+#define NAME_M(m) ((name_matcher_t *)(m))
 
 /* match attributes */
 typedef struct {
-	obj_matcher_t super;
+	sdb_store_matcher_t super;
+	char *name;
 	/* XXX: this needs to be more flexible;
 	 *      add support for type-specific operators */
-	name_matcher_t value;
+	string_matcher_t value;
 } attr_matcher_t;
 #define ATTR_M(m) ((attr_matcher_t *)(m))
 
-/* match services */
-typedef struct {
-	obj_matcher_t super;
-	/* match by attributes assigned to the service */
-	attr_matcher_t *attr;
-} service_matcher_t;
-#define SERVICE_M(m) ((service_matcher_t *)(m))
-
-/* match hosts */
+/* match using conditionals */
 typedef struct {
-	obj_matcher_t super;
-	/* match by services assigned to the host */
-	service_matcher_t *service;
-	/* match by attributes assigned to the host */
-	attr_matcher_t *attr;
-} host_matcher_t;
-#define HOST_M(m) ((host_matcher_t *)(m))
+	sdb_store_matcher_t super;
+	sdb_store_cond_t *cond;
+} cond_matcher_t;
+#define COND_M(m) ((cond_matcher_t *)(m))
 
 #ifdef __cplusplus
 } /* extern "C" */