X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fstore.c;h=47ba0356933453d4aa0c061daf23a6d3ad4a727c;hb=39a45905e0b237e458b1826ff9b4fad1c4a59550;hp=7e2602730d774cf83454775e79ff87f283b82677;hpb=cb0bc268297f6bc7ff1d409591edebb4dfbfca34;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index 7e26027..47ba035 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -25,8 +25,12 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#	include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
-#include "core/store.h"
+#include "core/store-private.h"
 #include "core/plugin.h"
 #include "utils/error.h"
 #include "utils/llist.h"
@@ -55,50 +59,6 @@ static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
 static sdb_type_t sdb_store_obj_type;
 static sdb_type_t sdb_attribute_type;
 
-struct sdb_store_base {
-	sdb_object_t super;
-
-	/* object type */
-	int type;
-
-	/* common meta information */
-	sdb_time_t last_update;
-	sdb_store_base_t *parent;
-};
-#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
-#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
-
-typedef struct {
-	sdb_store_base_t super;
-
-	sdb_data_t value;
-} sdb_attribute_t;
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
-
-typedef struct {
-	sdb_store_base_t super;
-
-	sdb_llist_t *children;
-	sdb_llist_t *attributes;
-} sdb_store_obj_t;
-#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
-#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
-
-enum {
-	SDB_HOST = 1,
-	SDB_SERVICE,
-	SDB_ATTRIBUTE,
-};
-#define TYPE_TO_NAME(t) \
-	(((t) == SDB_HOST) ? "host" \
-		: ((t) == SDB_SERVICE) ? "service" \
-		: ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
-
-/* shortcuts for accessing the sdb_store_obj_t attributes
- * of inheriting objects */
-#define _last_update super.last_update
-
 static int
 store_base_init(sdb_object_t *obj, va_list ap)
 {
@@ -412,11 +372,15 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
 		time_str[sizeof(time_str) - 1] = '\0';
 
 		sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
-		if (type == SDB_ATTRIBUTE)
-			/* XXX: this needs to be type-dependent */
-			sdb_strbuf_append(buf, "\"value\": \"%s\", ",
-					SDB_ATTR(sobj)->value.data.string);
-		sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+		if (type == SDB_ATTRIBUTE) {
+			char tmp[sdb_data_strlen(&SDB_ATTR(sobj)->value) + 1];
+			sdb_data_format(&SDB_ATTR(sobj)->value, tmp, sizeof(tmp),
+					SDB_DOUBLE_QUOTED);
+			sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\"}",
+					tmp, time_str);
+		}
+		else
+			sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
 
 		if (sdb_llist_iter_has_next(iter))
 			sdb_strbuf_append(buf, ",");
@@ -430,6 +394,13 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
  * public API
  */
 
+void
+sdb_store_clear(void)
+{
+	sdb_llist_destroy(obj_list);
+	obj_list = NULL;
+} /* sdb_store_clear */
+
 int
 sdb_store_host(const char *name, sdb_time_t last_update)
 {