merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -5,6 +5,8 @@ are given with the most recent entry first.
 Fixed:
 - force lookup of journal props in anydbm filtering
 - fixed lookup of "missing" Link values for new props in anydbm backend
+- allow list of values for id, Number and Boolean filtering in anydbm
+  backend
 
 
 2004-06-10 0.7.4

doc/index.txt

@@ -89,6 +89,7 @@ Dan Grassi,
 Engelbert Gruber,
 Juergen Hermann,
 Tobias Hunger,
+Simon Hyde,
 Christophe Kalt,
 Brian Kelley,
 James Kew,

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.146.2.8 2004-06-13 00:40:55 richard Exp $
+#$Id: back_anydbm.py,v 1.146.2.9 2004-06-13 01:11:23 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
@@ -1654,15 +1654,26 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                     pass
 
             elif isinstance(propclass, Boolean):
-                if type(v) is type(''):
-                    bv = v.lower() in ('yes', 'true', 'on', '1')
-                else:
-                    bv = v
+                if type(v) != type([]):
+                    v = v.split(',')
+                bv = []
+                for val in v:
+                    if type(val) is type(''):
+                        bv.append(val.lower() in ('yes', 'true', 'on', '1'))
+                    else:
+                        bv.append(val)
                 l.append((OTHER, k, bv))
+
+            elif k == 'id':
+                if type(v) != type([]):
+                    v = v.split(',')
+                l.append((OTHER, k, [str(int(val)) for val in v]))
+
             elif isinstance(propclass, Number):
-                l.append((OTHER, k, float(v)))
-            else:
-                l.append((OTHER, k, v))
+                if type(v) != type([]):
+                    v = v.split(',')
+                l.append((OTHER, k, [float(val) for val in v]))
+
         filterspec = l
 
         # now, find all the nodes that are active and pass filtering
@@ -1678,7 +1689,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                 # apply filter
                 for t, k, v in filterspec:
                     # handle the id prop
-                    if k == 'id' and v == nodeid:
+                    if k == 'id' and nodeid in v:
                         continue
 
                     # make sure the node has the property
@@ -1726,7 +1737,7 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                                 break
                     elif t == OTHER:
                         # straight value comparison for the other types
-                        if node[k] != v:
+                        if node[k] not in v:
                             break
                 else:
                     matches.append([nodeid, node])

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: db_test_base.py,v 1.27.2.3 2004-06-09 06:37:22 richard Exp $ 
+# $Id: db_test_base.py,v 1.27.2.4 2004-06-13 01:08:06 richard Exp $ 
 
 import unittest, os, shutil, errno, imp, sys, time, pprint
 
@@ -846,6 +846,7 @@ def testFilteringNumber(self):
         ae(filt(None, {'age': '1'}, ('+','id'), (None,None)), ['3'])
         ae(filt(None, {'age': '1.5'}, ('+','id'), (None,None)), ['4'])
         ae(filt(None, {'age': '2'}, ('+','id'), (None,None)), ['5'])
+        ae(filt(None, {'age': ['1','2']}, ('+','id'), (None,None)), ['3','5'])
 
     def testFilteringString(self):
         ae, filt = self.filteringSetup()