X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore_expr.c;h=0a8757f0911568b5b9b2cf8c66ad1fcc0ade62cd;hb=bd23ae3fbe9af45288d515bd5e85742f8766fcf1;hp=7d674bc2f6b8e77bd87432b81532b34313da17ad;hpb=45e97a5c2c641995c7a6fd036ca11a6341f227c8;p=sysdb.git

diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index 7d674bc..0a8757f 100644
--- a/src/core/store_expr.c
+++ b/src/core/store_expr.c
@@ -39,27 +39,8 @@
 #include "core/object.h"
 
 #include <assert.h>
-
-/*
- * private data types
- */
-
-struct sdb_store_expr {
-	sdb_object_t super;
-
-	/*
-	 * type:
-	 * -1: field value (field type store in data.data.integer)
-	 *  0: const value (stored in data)
-	 * >0: operator id
-	 */
-	int type;
-
-	sdb_store_expr_t *left;
-	sdb_store_expr_t *right;
-
-	sdb_data_t data;
-};
+#include <stdlib.h>
+#include <string.h>
 
 /*
  * private data types
@@ -86,8 +67,7 @@ expr_init(sdb_object_t *obj, va_list ap)
 	}
 
 	if (value)
-		if (sdb_data_copy(&expr->data, value))
-			return -1;
+		expr->data = *value;
 
 	sdb_object_ref(SDB_OBJ(left));
 	sdb_object_ref(SDB_OBJ(right));
@@ -122,10 +102,20 @@ static sdb_type_t expr_type = {
 sdb_store_expr_t *
 sdb_store_expr_create(int op, sdb_store_expr_t *left, sdb_store_expr_t *right)
 {
-	if ((op < 0) || (SDB_DATA_CONCAT < op))
+	sdb_data_t value = SDB_DATA_INIT;
+
+	if ((op < 0) || (SDB_DATA_CONCAT < op) || (! left) || (! right))
+		return NULL;
+
+	if (left->type || right->type)
+		return SDB_STORE_EXPR(sdb_object_create("store-expr", expr_type,
+					op, left, right, NULL));
+	/* else: both expressions are constant values; evaluate now */
+
+	if (sdb_data_expr_eval(op, &left->data, &right->data, &value))
 		return NULL;
-	return SDB_STORE_EXPR(sdb_object_create("store-expr", expr_type,
-				op, left, right, NULL));
+	return SDB_STORE_EXPR(sdb_object_create("store-constvalue", expr_type,
+				0, NULL, NULL, &value));
 } /* sdb_store_expr_create */
 
 sdb_store_expr_t *
@@ -135,43 +125,68 @@ sdb_store_expr_fieldvalue(int field)
 	if ((field < 0) || (SDB_FIELD_BACKEND < field))
 		return NULL;
 	return SDB_STORE_EXPR(sdb_object_create("store-fieldvalue", expr_type,
-				-1, NULL, NULL, &value));
+				FIELD_VALUE, NULL, NULL, &value));
 } /* sdb_store_expr_fieldvalue */
 
+sdb_store_expr_t *
+sdb_store_expr_attrvalue(const char *name)
+{
+	sdb_data_t value = { SDB_TYPE_STRING, { .string = NULL} };
+	sdb_store_expr_t *expr;
+
+	value.data.string = strdup(name);
+	if (! value.data.string)
+		return NULL;
+
+	expr = SDB_STORE_EXPR(sdb_object_create("store-attrvalue", expr_type,
+				ATTR_VALUE, NULL, NULL, &value));
+	if (! expr)
+		free(value.data.string);
+	return expr;
+} /* sdb_store_expr_attrvalue */
+
 sdb_store_expr_t *
 sdb_store_expr_constvalue(const sdb_data_t *value)
 {
+	sdb_data_t data = SDB_DATA_INIT;
+	if (sdb_data_copy(&data, value))
+		return NULL;
 	return SDB_STORE_EXPR(sdb_object_create("store-constvalue", expr_type,
-				0, NULL, NULL, value));
+				0, NULL, NULL, &data));
 } /* sdb_store_expr_constvalue */
 
 int
 sdb_store_expr_eval(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
-		sdb_data_t *res)
+		sdb_data_t *res, sdb_store_matcher_t *filter)
 {
 	sdb_data_t v1 = SDB_DATA_INIT, v2 = SDB_DATA_INIT;
+	int status = 0;
 
 	if ((! expr) || (! res))
 		return -1;
 
+	if (filter && obj && (! sdb_store_matcher_matches(filter, obj, NULL)))
+		obj = NULL; /* this object does not exist */
+
 	if (! expr->type)
 		return sdb_data_copy(res, &expr->data);
-	else if (expr->type < 0)
+	else if (expr->type == FIELD_VALUE)
 		return sdb_store_get_field(obj, (int)expr->data.data.integer, res);
+	else if (expr->type == ATTR_VALUE)
+		return sdb_store_get_attr(obj, expr->data.data.string, res, filter);
 
-	if (sdb_store_expr_eval(expr->left, obj, &v1))
+	if (sdb_store_expr_eval(expr->left, obj, &v1, filter))
 		return -1;
-	if (sdb_store_expr_eval(expr->right, obj, &v2)) {
+	if (sdb_store_expr_eval(expr->right, obj, &v2, filter)) {
 		sdb_data_free_datum(&v1);
 		return -1;
 	}
 
-	if (sdb_data_expr_eval(expr->type, &v1, &v2, res)) {
-		sdb_data_free_datum(&v1);
-		sdb_data_free_datum(&v2);
-		return -1;
-	}
-	return 0;
+	if (sdb_data_expr_eval(expr->type, &v1, &v2, res))
+		status = -1;
+	sdb_data_free_datum(&v1);
+	sdb_data_free_datum(&v2);
+	return status;
 } /* sdb_store_expr_eval */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */