Ticket #2707: xapian.py.patch

django/contrib/search/xapian.py

@@ -4 +4 @@
 import xapwrap.document
 from itertools import imap
 
-from base import Indexer, ResultSet
+from query import ResultSet, Hit
+from base import Indexer
 
 # TODO: This is incomplete.
 
@@ -17 +18 @@
         else:
             update_queue = documents
 
-        for row in documents:
+        for row in update_queue:
             keys = []
+            text_fields = []
             for name, field in self.attr_fields.iteritems():
-                keys.append(xapwrap.document.SortKey(name, getattr(self.model, field.name)))
-
-            d = xapwrap.document.Document(textFields=fields, sortFields=keys, uid=row._get_pk_val())
+                field_name = str(getattr(row, field.name))
+                #keys.append(xapwrap.document.SortKey(name, field_name))
+                text_fields.append(xapwrap.document.TextField(name,field_name))
+            d = xapwrap.document.Document(textFields=text_fields,sortFields=keys, uid=row._get_pk_val())
             idx.index(d)
         idx.close()
 
     def search(self, query, order_by='RELEVANCE'):
-        idx = Index(self.path)
+        idx = xapwrap.index.Index(self.path)
         if order_by == 'RELEVANCE':
             results = idx.search(query, sortByRelevence=True)
         else:
@@ -37 +40 @@
             while order_by[0] in '+-':
                 order_by = order_by[1:]
             results = idx.search(query, order_by, sortAscending=ascending)
-        return XapianResultSet(results)
+        return XapianResultSet(results,self)
 
 
 class XapianResultSet(ResultSet):
@@ -49 +52 @@
         return len(self._hits)
 
     def __iter__(self):
-        for hit in self._hits):
-            yield XapianHit(hit, self._indexer)
+        for hit in self._hits:
+            yield XapianHit(hit,self._indexer)
 
 
-class XapianHit(object):
+class XapianHit(Hit):
     def get_pk(self):
-        return self.data['pk']
+        # FIXME: Hardcoded 'pk' field.
+        return self.data['uid']
 
+    def __getitem__(self, item):
+        return self.data.__getitem__(item)
+
     def get_score(self):
         return self.data['score']
 
     score = property(get_score)
-