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-05-23 19:24:20 (GMT)
committer Benjamin Saller <bcsaller@objectrealms.net>2007-05-23 19:24:20 (GMT)
commit50abd7b5a34d8107abb49fe1635c719b2f80b010 (patch)
tree7fcc55dd269312335bff91d2b1ffa52f4ca13c19 /bin
parentfad55ef1f817b11301929df513f27438605b0a13 (diff)
work in progress, need to fix head
Diffstat (limited to 'bin')
-rw-r--r--bin/index-service20
1 files changed, 9 insertions, 11 deletions
diff --git a/bin/index-service b/bin/index-service
index 2591dfe..583c396 100644
--- a/bin/index-service
+++ b/bin/index-service
@@ -9,9 +9,9 @@ access the Xapian repository in read only mode.
from ore.main import Application
-from olpc.datastore.datastore import _DS_SERVICE, _DS_OBJECT_PATH
-from olpc.datastore.datastore import _DS_DBUS_INTERFACE
-from olpc.datastore.query import XapianFulltext
+from olpc.datastore.datastore import DS_SERVICE, DS_OBJECT_PATH
+from olpc.datastore.datastore import DS_DBUS_INTERFACE
+from olpc.datastore.indexer import Indexer
import dbus
import dbus.mainloop.glib
@@ -27,23 +27,21 @@ class IndexService(Application):
def main(self):
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
bus = dbus.SessionBus()
- self.fulltext = XapianFulltext()
- self.fulltext.connect_fulltext(read_only=False)
-
- self.ds = bus.get_object(_DS_SERVICE, _DS_OBJECT_PATH)
+ self.fulltext = Indexer()
+ self.ds = bus.get_object(DS_SERVICE, DS_OBJECT_PATH)
self.ds.connect_to_signal("Created", self.created,
- dbus_interface=_DS_DBUS_INTERFACE)
+ dbus_interface=DS_DBUS_INTERFACE)
self.ds.connect_to_signal("Updated", self.updated,
- dbus_interface=_DS_DBUS_INTERFACE)
+ dbus_interface=DS_DBUS_INTERFACE)
self.ds.connect_to_signal("Deleted", self.deleted,
- dbus_interface=_DS_DBUS_INTERFACE)
+ dbus_interface=DS_DBUS_INTERFACE)
self.ds.connect_to_signal("Stopped", self.stopped,
- dbus_interface=_DS_DBUS_INTERFACE)
+ dbus_interface=DS_DBUS_INTERFACE)
self.eventloop.run()