merge fixes from HEAD

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,12 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+
+2003-??-?? 0.5.5
+- fixed rdbms searching by ID (sf bug 666615)
+- detect corrupted index and raise semi-useful exception (sf bug 666767)
+
+
 2003-01-10 0.5.4
 - key the templates cache off full path, not filename
 - implemented whole-database locking

roundup/backends/back_gadfly.py

@@ -1,4 +1,4 @@
-# $Id: back_gadfly.py,v 1.31 2003-01-08 05:39:40 richard Exp $
+# $Id: back_gadfly.py,v 1.31.2.1 2003-01-12 23:57:15 richard Exp $
 ''' Gadlfy relational database hypderb backend.
 
 About Gadfly
@@ -185,6 +185,14 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                 else:
                     where.append('_%s=%s'%(k, a))
                     args.append(date.Interval(v).serialise())
+            elif k == 'id':
+                if isinstance(v, type([])):
+                    s = ','.join([a for x in v])
+                    where.append('%s in (%s)'%(k, s))
+                    args = args + v
+                else:
+                    where.append('%s=%s'%(k, a))
+                    args.append(v)
             else:
                 if isinstance(v, type([])):
                     s = ','.join([a for x in v])

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.27 2003-01-08 05:39:40 richard Exp $
+# $Id: rdbms_common.py,v 1.27.2.1 2003-01-12 23:57:16 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1762,6 +1762,14 @@ def filter(self, search_matches, filterspec, sort=(None,None),
                 else:
                     where.append('id=%s.nodeid and %s.linkid = %s'%(tn, tn, a))
                     args.append(v)
+            elif k == 'id':
+                if isinstance(v, type([])):
+                    s = ','.join([a for x in v])
+                    where.append('%s in (%s)'%(k, s))
+                    args = args + v
+                else:
+                    where.append('%s=%s'%(k, a))
+                    args.append(v)
             elif isinstance(propclass, String):
                 if not isinstance(v, type([])):
                     v = [v]