data: Format NULL as NULL and never quote it.

[sysdb.git] / src / core / store_expr.c

diff --git a/src/core/store_expr.c b/src/core/store_expr.c
index ca7b72b52f6a246de610c73de1d0672736057ee0..ed0589bc28d1a37c32c6ea93400331410b01c532 100644 (file)
--- a/src/core/store_expr.c
+++ b/src/core/store_expr.c
@@ -42,31 +42,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/*
- * private data types
- */
-
-/*
- * expression types:
- */
-enum {
-       ATTR_VALUE  = -2, /* attr name stored in data.data.string */
-       FIELD_VALUE = -1, /* field type stored in data.data.integer */
-       /*  0: const value (stored in data) */
-       /* >0: operator id */
-};
-
-struct sdb_store_expr {
-       sdb_object_t super;
-
-       int type; /* see above */
-
-       sdb_store_expr_t *left;
-       sdb_store_expr_t *right;
-
-       sdb_data_t data;
-};
-
 /*
  * private data types
  */
@@ -182,7 +157,7 @@ sdb_store_expr_constvalue(const sdb_data_t *value)
 
 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;
@@ -190,16 +165,27 @@ sdb_store_expr_eval(sdb_store_expr_t *expr, sdb_store_obj_t *obj,
        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 == 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);
+       else if (expr->type == ATTR_VALUE) {
+               status = sdb_store_get_attr(obj, expr->data.data.string, res, filter);
+               if ((status < 0) && obj) {
+                       /* attribute does not exist => NULL */
+                       status = 0;
+                       res->type = SDB_TYPE_STRING;
+                       res->data.string = NULL;
+               }
+               return status;
+       }
 
-       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;
        }