Change indexer_common.search() to take a list of nodeids...

...instead of a dictionary (with random keys) from getHits(). This
removes another Python 2.1 incompatility (using dict() and
enumerate()) and removes the need for some code in
indexer_rdbms.find().

Author: Johannes Gijsbers

roundup/backends/back_tsearch2.py

@@ -98,14 +98,14 @@ def find(self, search_terms, klass):
         if not search_terms:
             return None
 
-        nodeids = self.tsearchQuery(klass.classname, search_terms)
+        hits = self.tsearchQuery(klass.classname, search_terms)
         designator_propname = {}
 
         for nm, propclass in klass.getprops().items():
             if _isLink(propclass):
-                nodeids.extend(self.tsearchQuery(propclass.classname, search_terms))
+                hits.extend(self.tsearchQuery(propclass.classname, search_terms))
 
-        return dict(enumerate(nodeids))
+        return hits
 
     def tsearchQuery(self, classname, search_terms):
         query = """SELECT id FROM _%(classname)s

roundup/backends/indexer_common.py

@@ -32,7 +32,7 @@ def search(self, search_terms, klass, ignore={}):
         propspec = {}     # used to do the klass.find
         for propname in designator_propname.values():
             propspec[propname] = {}   # used as a set (value doesn't matter)
-        for classname, nodeid, property in hits.values():
+        for classname, nodeid, property in hits:
             # skip this result if we don't care about this class/property
             if ignore.has_key((classname, property)):
                 continue

roundup/backends/indexer_dbm.py

@@ -14,7 +14,7 @@
 #     that promote freedom, but obviously am giving up any rights
 #     to compel such.
 # 
-#$Id: indexer_dbm.py,v 1.3 2005-01-04 16:48:46 jlgijsbers Exp $
+#$Id: indexer_dbm.py,v 1.4 2005-01-05 22:14:21 jlgijsbers Exp $
 '''This module provides an indexer class, RoundupIndexer, that stores text
 indices in a roundup instance.  This class makes searching the content of
 messages, string properties and text files possible.
@@ -184,7 +184,7 @@ def find(self, wordlist):
                         del hits[fileid]
         if hits is None:
             return {}
-        return hits
+        return hits.values()
 
     segments = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ#_-!"
     def load_index(self, reload=0, wordlist=None):

roundup/backends/indexer_rdbms.py

@@ -126,15 +126,7 @@ def find(self, wordlist):
 
             self.db.cursor.execute(sql, tuple(map(int, r)))
 
-        # self.search_index has the results as {some id: identifier} ...
-        # sigh
-        r = {}
-        k = 0
-        for c,n,p in self.db.cursor.fetchall():
-            key = (str(c), str(n), str(p))
-            r[k] = key
-            k += 1
-        return r
+        return self.db.cursor.fetchall()
 
     def save_index(self):
         # the normal RDBMS backend transaction mechanisms will handle this