Changeset 466 for pyndexter/branches/simplification/pyndexter/indexers/_hyperestraier.py

Timestamp:

27/11/07 01:09:26 (3 years ago)

Author:

athomas

Message:

pyndexter: Documents are now referenced by a user-defined key rather than a
URI. It was a needless restriction. Fixed hyperestraier unit tests up a bit.

Files:

• pyndexter/branches/simplification/pyndexter/indexers/_hyperestraier.py (modified) (2 diffs)

pyndexter/branches/simplification/pyndexter/indexers/_hyperestraier.py

@@ -78 +78 @@
 
     def index(self, document):
-        uri = unicode(document.uri)
+        key = unicode(document.key)
         hdoc = hyperestraier.Document()
         for k, v in document.iteritems():
             hdoc.add_attr(u'@' + k, v)
-        hdoc.add_attr(u'@uri', uri)
+        hdoc.add_attr(u'@uri', key)
         for line in document.texts:
             hdoc.add_text(line)
         if not self.db.put_doc(hdoc):
-            raise errors.IndexerError('Failed to index %s' % document.uri)
+            raise errors.IndexerError('Failed to index %s' % document.key)
 
-    def discard(self, uri):
-        uri = unicode(uri)
-        if not self.db.out_doc_by_uri(uri):
-            raise errors.DocumentNotFound(uri)
+    def discard(self, key):
+        key = unicode(key)
+        try:
+            self.db.out_doc_by_uri(key)
+        except hyperestraier.HyperestraierError, e:
+            raise errors.DocumentNotFound(key)
 
-    def fetch(self, uri):
-        uri = unicode(uri)
-        doc = self.db.get_doc_by_uri(uri)
+    def fetch(self, key):
+        key = unicode(key)
+        doc = self.db.get_doc_by_uri(key)
         if not doc:
-            raise errors.DocumentNotFound(uri)
+            raise errors.DocumentNotFound(key)
         attributes = self._translate_attributes(doc)
-        return Document(uri, texts=doc.dtexts, quality=0.99,
+        return Document(key, texts=doc.dtexts, quality=0.99,
                         attributes=attributes)
 
@@ -152 +154 @@
     # Internal methods
     def _translate(self, doc):
-        return Hit(uri=doc.uri, document=self.indexer.fetch,
+        return Hit(key=doc.uri, document=self.indexer.fetch,
                    attributes=self.indexer._translate_attributes(doc))