Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorBenjamin Saller <bcsaller@objectrealms.net>2007-06-22 05:14:00 (GMT)
committer Benjamin Saller <bcsaller@objectrealms.net>2007-06-22 05:14:00 (GMT)
commit3e3306c37472798842d44202930faa4a6f192ea1 (patch)
tree35c08846a8de1b185d4b58f32277dabb4ca2068d /bin
parentd46650e2e0fb9c41174ba8c85bfd90fd964f1916 (diff)
repairs to the service
Diffstat (limited to 'bin')
-rwxr-xr-xbin/datastore-service10
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/datastore-service b/bin/datastore-service
index dc3af92..955a508 100755
--- a/bin/datastore-service
+++ b/bin/datastore-service
@@ -3,7 +3,7 @@ import sys, os, signal
import gobject
import dbus.service
import dbus.mainloop.glib
-from olpc.datastore import DataStore, DS_LOG_CHANNEL
+from olpc.datastore import DataStore, DS_LOG_CHANNEL, backingstore
from olpc.datastore.indexer import INDEX_SERVICE, INDEX_OBJECT_PATH
import logging
@@ -11,7 +11,6 @@ import logging
profile = os.environ.get('SUGAR_PROFILE', 'default')
base_dir = os.path.join(os.path.expanduser('~'), '.sugar', profile)
repo_dir = os.path.join(base_dir, 'datastore')
-db_dir = "sqlite:///%s/datastore.db" % repo_dir
# operate from the repo directory
if not os.path.exists(repo_dir): os.makedirs(repo_dir)
@@ -48,10 +47,13 @@ if not sys.stdin.isatty():
# build the datastore
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
bus = dbus.SessionBus()
-ds = DataStore(repo_dir, db_dir, querymanager_sync_index=False)
+
+ds = DataStore(querymanager_sync_index=False)
+ds.registerBackend(backingstore.FileBackingStore)
+ds.mount(repo_dir)
# and run it
-logger.info("Starting Datastore %s:%s" % (repo_dir, db_dir))
+logger.info("Starting Datastore %s" % (repo_dir))
mainloop = gobject.MainLoop()
def handle_shutdown(signum, frame):