Merged main and updated stuff.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/db/dictionary.py b/src/db/dictionary.py
index 15f8f88..f0f5fe9 100755
--- a/src/db/dictionary.py
+++ b/src/db/dictionary.py
@@ -11,7 +11,8 @@ import os
 import sys
 import time
 
-from db import couch, index
+from db import couch
+from db.schema import as_index_list, validate_collector_data
 
 
 class DictDB():
@@ -46,7 +47,7 @@ class DictDB():
             print("Creating database and indexes.")
             self.couchdb = self.server.create(self.database)
 
-            for i in index.as_list():
+            for i in as_index_list():
                 self.couchdb.index(i)
 
         self._ts = time.time()
@@ -71,9 +72,15 @@ class DictDB():
 
         if type(data) is list:
             for item in data:
+                error = validate_collector_data(item)
+                if error != "":
+                    return error
                 item['_id'] = str(self.unique_key())
             ret = self.couchdb.save_bulk(data)
         else:
+            error = validate_collector_data(data)
+            if error != "":
+                return error
             data['_id'] = str(self.unique_key())
             ret = self.couchdb.save(data)