fix SearchAction use of Class.filter(), and clarify API docs for same

Author: Richard Jones

CHANGES.txt

@@ -12,6 +12,7 @@ Feature:
 Fixed:
 - add "checked" to truth values for Boolean input
 - fixed import in metakit backend
+- fix SearchAction use of Class.filter(), and clarify API docs for same
 
 
 2004-05-?? 0.7.2

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.148 2004-05-16 09:35:49 richard Exp $
+#$Id: back_anydbm.py,v 1.149 2004-05-23 23:24:47 richard Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -1579,7 +1579,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         "sort" and "group" are (dir, prop) where dir is '+', '-' or None
         and prop is a prop name or None
 
-        "search_matches" is {nodeid: marker}
+        "search_matches" is {nodeid: marker} or None
 
         The filter must match all properties specificed - but if the
         property value to match is a list, any one of the values in the

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.71 2004-05-18 15:17:19 wc2so1 Exp $
+# $Id: back_metakit.py,v 1.72 2004-05-23 23:24:47 richard Exp $
 '''Metakit backend for Roundup, originally by Gordon McMillan.
 
 Known Current Bugs:
@@ -1174,7 +1174,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         "sort" and "group" are (dir, prop) where dir is '+', '-' or None
         and prop is a prop name or None
 
-        "search_matches" is {nodeid: marker}
+        "search_matches" is {nodeid: marker} or None
 
         The filter must match all properties specificed - but if the
         property value to match is a list, any one of the values in the

roundup/backends/back_mysql.py

@@ -499,16 +499,12 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         "sort" and "group" are (dir, prop) where dir is '+', '-' or None
         and prop is a prop name or None
 
-        "search_matches" is {nodeid: marker}
+        "search_matches" is {nodeid: marker} or None
 
         The filter must match all properties specificed - but if the
         property value to match is a list, any one of the values in the
         list may match for that property to match.
         '''
-        # just don't bother if the full-text search matched diddly
-        if search_matches == {}:
-            return []
-
         if __debug__:
             start_t = time.time()
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.101 2004-05-16 21:49:30 richard Exp $
+# $Id: rdbms_common.py,v 1.102 2004-05-23 23:24:47 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1991,16 +1991,12 @@ def filter(self, search_matches, filterspec, sort=(None,None),
         "sort" and "group" are (dir, prop) where dir is '+', '-' or None
         and prop is a prop name or None
 
-        "search_matches" is {nodeid: marker}
+        "search_matches" is {nodeid: marker} or None
 
         The filter must match all properties specificed - but if the
         property value to match is a list, any one of the values in the
         list may match for that property to match.
         '''
-        # just don't bother if the full-text search matched diddly
-        if search_matches == {}:
-            return []
-
         if __debug__:
             start_t = time.time()
 
@@ -2198,6 +2194,8 @@ def filter(self, search_matches, filterspec, sort=(None,None),
             # psycopg doesn't like empty args
             self.db.cursor.execute(sql)
         l = self.db.sql_fetchall()
+        if __debug__:
+            print >>hyperdb.DEBUG, '... matched', len(l)
 
         # return the IDs (the first column)
         # XXX numeric ids

roundup/cgi/actions.py

@@ -1,4 +1,4 @@
-#$Id: actions.py,v 1.28 2004-05-13 00:19:35 richard Exp $
+#$Id: actions.py,v 1.29 2004-05-23 23:24:47 richard Exp $
 
 import re, cgi, StringIO, urllib, Cookie, time, random
 
@@ -148,18 +148,20 @@ def handle(self, wcre=re.compile(r'[\s,]+')):
                 # edit the new way, query name not a key any more
                 # see if we match an existing private query
                 uid = self.db.getuid()
-                qids = self.db.query.filter({}, {'name': queryname,
+                qids = self.db.query.filter(None, {'name': queryname,
                         'private_for': uid})
                 if not qids:
                     # ok, so there's not a private query for the current user
                     # - see if there's a public one created by them
-                    qids = self.db.query.filter({}, {'name': queryname,
+                    qids = self.db.query.filter(None, {'name': queryname,
                         'private_for': -1, 'creator': uid})
 
                 if qids:
-                    # edit query
-                    qid = qids[0]
-                    self.db.query.set(qid, klass=self.classname, url=url)
+                    # edit query - make sure we get an exact match on the name
+                    for qid in qids:
+                        if queryname != self.db.query.get(qid, 'name'):
+                            continue
+                        self.db.query.set(qid, klass=self.classname, url=url)
                 else:
                     # create a query
                     qid = self.db.query.create(name=queryname,