Making some progress :)

2 files changed, 20 insertions, 16 deletions

diff --git a/bin/datastore-service.py b/bin/datastore-service.py
index e8d9961..6453d3e 100755
--- a/bin/datastore-service.py
+++ b/bin/datastore-service.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python2
 import sys
+sys.path.append('/home/cgueret/Code/sugar-datastore/src')
+
 import os
 import signal
 import logging
@@ -11,6 +13,7 @@ from carquinyol.datastore import DataStore
 from sugar import logger
 
 
+
 # Path handling
 profile = os.environ.get('SUGAR_PROFILE', 'default')
 base_dir = os.path.join(os.path.expanduser('~'), '.sugar', profile)
@@ -19,8 +22,9 @@ if not os.path.exists(log_dir):
     os.makedirs(log_dir)
 
 # setup logger
-# logger.start('datastore')
-
+logger.start('datastore')
+#logging.basicConfig(level=5, format='%(created)f %(levelname)s %(name)s: %(message)s', stream=sys.stderr)
+#logging.getLogger('').setLevel(5)
 
 # build the datastore
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
diff --git a/bin/test.py b/bin/test.py
index 4ccd715..a45b8c7 100644
--- a/bin/test.py
+++ b/bin/test.py
@@ -12,18 +12,18 @@ if os.path.exists("/tmp/olpc-session-bus"):
     os.environ["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/tmp/olpc-session-bus"
 
 if __name__ == "__main__":
-    try:
-        entry = datastore.create()
-        entry.metadata['title'] = 'Terminal-test'
-        print entry.metadata.get_dictionary().copy()
-        datastore.write(entry)
-        
-        query = {}
-        query['query'] = '*Terminal*'
-        objects, count = datastore.find(query, limit=2)
-        print objects, count
-    except dbus.DBusException:
-        print 'ERROR: Unable to connect to the datastore.\n'
-    except Exception, e:
-        print 'ERROR: %s' % (e)
+    entry = datastore.create()
+    entry.metadata['title'] = 'Terminal-test'
+    entry.metadata['activity'] = 'Terminal'
+    entry.metadata['activity_id'] = 'Terminal'
+    #datastore.write(entry)
+    #print "Saved %s" % entry.get_object_id()
+    entry.destroy()
+    
+    query = {}
+    #query['query'] = 'Terminal*'
+    query['activity_id'] = 'Terminal'
+    print "Search %r" % query
+    objects, count = datastore.find(query, limit=2)
+    print objects, count