Class.find() may now find unset Links [SF#700620]

Author: Richard Jones

CHANGES.txt

@@ -53,6 +53,7 @@ Feature:
 - more lenient date input and addition Interval input support (sf bug 677764)
 - roundup mailgw now handles apop
 - implemented ability to search for multilink properties with no value
+- Class.find() may now find unset Links (sf bug 700620)
 
 
 Fixed:

roundup/admin.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: admin.py,v 1.47 2003-03-23 09:37:20 richard Exp $
+# $Id: admin.py,v 1.48 2003-03-26 10:43:58 richard Exp $
 
 '''Administration commands for maintaining Roundup trackers.
 '''
@@ -541,7 +541,9 @@ def do_find(self, args):
         # number
         for propname, value in props.items():
             num_re = re.compile('^\d+$')
-            if not num_re.match(value):
+            if value == '-1':
+                props[propname] = None
+            elif not num_re.match(value):
                 # get the property
                 try:
                     property = cl.properties[propname]

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.116 2003-03-26 05:30:23 richard Exp $
+#$Id: back_anydbm.py,v 1.117 2003-03-26 10:43:59 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
@@ -1462,23 +1462,23 @@ def lookup(self, keyvalue):
 
     # change from spec - allows multiple props to match
     def find(self, **propspec):
-        '''Get the ids of nodes in this class which link to the given nodes.
+        '''Get the ids of items in this class which link to the given items.
 
-        'propspec' consists of keyword args propname=nodeid or
-                   propname={nodeid:1, }
+        'propspec' consists of keyword args propname=itemid or
+                   propname={itemid:1, }
         'propname' must be the name of a property in this class, or a
                    KeyError is raised.  That property must be a Link or
                    Multilink property, or a TypeError is raised.
 
-        Any node in this class whose 'propname' property links to any of the
-        nodeids will be returned. Used by the full text indexing, which knows
+        Any item in this class whose 'propname' property links to any of the
+        itemids will be returned. Used by the full text indexing, which knows
         that "foo" occurs in msg1, msg3 and file7, so we have hits on these
         issues:
 
             db.issue.find(messages={'1':1,'3':1}, files={'7':1})
         '''
         propspec = propspec.items()
-        for propname, nodeids in propspec:
+        for propname, itemids in propspec:
             # check the prop is OK
             prop = self.properties[propname]
             if not isinstance(prop, Link) and not isinstance(prop, Multilink):
@@ -1489,24 +1489,26 @@ def find(self, **propspec):
         l = []
         try:
             for id in self.getnodeids(db=cldb):
-                node = self.db.getnode(self.classname, id, db=cldb)
-                if node.has_key(self.db.RETIRED_FLAG):
+                item = self.db.getnode(self.classname, id, db=cldb)
+                if item.has_key(self.db.RETIRED_FLAG):
                     continue
-                for propname, nodeids in propspec:
-                    # can't test if the node doesn't have this property
-                    if not node.has_key(propname):
+                for propname, itemids in propspec:
+                    # can't test if the item doesn't have this property
+                    if not item.has_key(propname):
                         continue
-                    if type(nodeids) is type(''):
-                        nodeids = {nodeids:1}
+                    if type(itemids) is not type({}):
+                        itemids = {itemids:1}
+
+                    # grab the property definition and its value on this item
                     prop = self.properties[propname]
-                    value = node[propname]
-                    if isinstance(prop, Link) and nodeids.has_key(value):
+                    value = item[propname]
+                    if isinstance(prop, Link) and itemids.has_key(value):
                         l.append(id)
                         break
                     elif isinstance(prop, Multilink):
                         hit = 0
                         for v in value:
-                            if nodeids.has_key(v):
+                            if itemids.has_key(v):
                                 l.append(id)
                                 hit = 1
                                 break

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.44 2003-03-26 06:36:11 richard Exp $
+# $Id: back_metakit.py,v 1.45 2003-03-26 10:44:00 richard Exp $
 '''
    Metakit backend for Roundup, originally by Gordon McMillan.
 
@@ -17,7 +17,7 @@
       Interval  ''    convert to None
       Number    0     ambiguious :( - do nothing
       Boolean   0     ambiguious :( - do nothing
-      Link      ''    convert to None
+      Link      0     convert to None
       Multilink []    actually, mk can handle this one ;)
       Passowrd  ''    convert to None
       ========= ===== ====================================================
@@ -821,6 +821,8 @@ def find(self, **propspec):
         for propname, ids in propspec:
             if type(ids) is _STRINGTYPE:
                 ids = {int(ids):1}
+            elif ids is None:
+                ids = {0:1}
             else:
                 d = {}
                 for id in ids.keys():

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.51 2003-03-26 05:29:06 richard Exp $
+# $Id: rdbms_common.py,v 1.52 2003-03-26 10:44:03 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1673,6 +1673,8 @@ def find(self, **propspec):
             if type(values) is type(''):
                 allvalues += (values,)
                 where.append('_%s = %s'%(prop, a))
+            elif values is None:
+                where.append('_%s is NULL'%prop)
             else:
                 allvalues += tuple(values.keys())
                 where.append('_%s in (%s)'%(prop, ','.join([a]*len(values))))