index 86acd10ea17ccf0a05ca7a7d1faeda5b09c52446..0c9d36199abca8e6db5fea26e34c0c52c80b852f 100644 (file)
--- a/src/core/store_lookup.c
+++ b/src/core/store_lookup.c
if (! attr)
status = INT_MAX;
else if (attr->value.type != value.type)
- status = INT_MAX;
+ status = sdb_data_strcmp(&attr->value, &value);
else
status = sdb_data_cmp(&attr->value, &value);
sdb_data_free_datum(&value);
sdb_data_t value = SDB_DATA_INIT;
int status;
- if (sdb_store_get_field(obj, OBJ_C(cond)->field, &obj_value))
- return INT_MAX;
if (sdb_store_expr_eval(OBJ_C(cond)->expr, obj, &value))
return INT_MAX;
- if (obj_value.type != value.type) {
- sdb_data_free_datum(&value);
- return INT_MAX;
- }
- else if (OBJ_C(cond)->field == SDB_FIELD_BACKEND) {
+ if (OBJ_C(cond)->field == SDB_FIELD_BACKEND) {
/* this implementation is not actually a conditional but rather checks
* for equality (or rather, existence) only */
size_t i;
+
+ if (value.type != SDB_TYPE_STRING)
+ return INT_MAX;
+
status = INT_MAX;
for (i = 0; i < obj->backends_num; ++i) {
if (! strcasecmp(obj->backends[i], value.data.string)) {
break;
}
}
+ sdb_data_free_datum(&value);
+ return status;
}
- else {
- status = sdb_data_cmp(&obj_value, &value);
+
+ if (sdb_store_get_field(obj, OBJ_C(cond)->field, &obj_value))
+ return INT_MAX;
+ if (obj_value.type != value.type) {
+ sdb_data_free_datum(&obj_value);
+ sdb_data_free_datum(&value);
+ return INT_MAX;
}
+
+ status = sdb_data_cmp(&obj_value, &value);
+ sdb_data_free_datum(&obj_value);
sdb_data_free_datum(&value);
return status;
} /* obj_cmp */
int
sdb_store_parse_field_name(const char *name)
{
- if (! strcasecmp(name, "last_update"))
+ if (! strcasecmp(name, "name"))
+ return SDB_FIELD_NAME;
+ else if (! strcasecmp(name, "last_update"))
return SDB_FIELD_LAST_UPDATE;
else if (! strcasecmp(name, "age"))
return SDB_FIELD_AGE;
if (! expr)
return NULL;
- if (sdb_store_expr_eval(expr, NULL, &value))
- return NULL;
- if (value.type != SDB_TYPE_STRING) {
+ if (sdb_store_expr_eval(expr, NULL, &value) ||
+ (value.type != SDB_TYPE_STRING)) {
sdb_data_free_datum(&value);
+ if (type != SDB_ATTRIBUTE)
+ return NULL;
return parse_attr_cmp(attr, op, expr);
}