. re-open the database as the author in mail handling

[roundup.git] / roundup / hyperdb.py

diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
index dbca83709d456c464e89514793ab0cf69f33837a..5a4e837645f4e11bffea554a3f3de7ede402fd4e 100644 (file)
--- a/roundup/hyperdb.py
+++ b/roundup/hyperdb.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: hyperdb.py,v 1.26 2001-10-16 03:48:01 richard Exp $
+# $Id: hyperdb.py,v 1.31 2001-11-12 22:01:06 richard Exp $
 
 # standard python modules
 import cPickle, re, string
@@ -507,7 +507,7 @@ class Class:
             if not isinstance(prop, Link) and not isinstance(prop, Multilink):
                 raise TypeError, "'%s' not a Link/Multilink property"%propname
             if not self.db.hasnode(prop.classname, nodeid):
-                raise ValueError, '%s has no node %s'%(link_class, nodeid)
+                raise ValueError, '%s has no node %s'%(prop.classname, nodeid)
 
         # ok, now do the find
         cldb = self.db.getclassdb(self.classname)
@@ -526,7 +526,8 @@ class Class:
         return l
 
     def stringFind(self, **requirements):
-        """Locate a particular node by matching a set of its String properties.
+        """Locate a particular node by matching a set of its String
+        properties in a caseless search.
 
         If the property is not a String property, a TypeError is raised.
         
@@ -536,6 +537,7 @@ class Class:
             prop = self.properties[propname]
             if isinstance(not prop, String):
                 raise TypeError, "'%s' not a String property"%propname
+            requirements[propname] = requirements[propname].lower()
         l = []
         cldb = self.db.getclassdb(self.classname)
         for nodeid in self.db.getnodeids(self.classname, cldb):
@@ -543,7 +545,7 @@ class Class:
             if node.has_key(self.db.RETIRED_FLAG):
                 continue
             for key, value in requirements.items():
-                if node[key] != value:
+                if node[key] and node[key].lower() != value:
                     break
             else:
                 l.append(nodeid)
@@ -584,11 +586,12 @@ class Class:
                 u = []
                 link_class =  self.db.classes[propclass.classname]
                 for entry in v:
-                    if not num_re.match(entry):
+                    if entry == '-1': entry = None
+                    elif not num_re.match(entry):
                         try:
                             entry = link_class.lookup(entry)
                         except:
-                            raise ValueError, 'new property "%s": %s not a %s'%(
+                            raise ValueError, 'property "%s": %s not a %s'%(
                                 k, entry, self.properties[k].classname)
                     u.append(entry)
 
@@ -697,6 +700,12 @@ class Class:
                             bv = bn[prop] = bv.lower()
                     if (isinstance(propclass, String) or
                             isinstance(propclass, Date)):
+                        # it might be a string that's really an integer
+                        try:
+                            av = int(av)
+                            bv = int(bv)
+                        except:
+                            pass
                         if dir == '+':
                             r = cmp(av, bv)
                             if r != 0: return r
@@ -840,6 +849,23 @@ def Choice(name, *options):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.30  2001/11/09 10:11:08  richard
+#  . roundup-admin now handles all hyperdb exceptions
+#
+# Revision 1.29  2001/10/27 00:17:41  richard
+# Made Class.stringFind() do caseless matching.
+#
+# Revision 1.28  2001/10/21 04:44:50  richard
+# bug #473124: UI inconsistency with Link fields.
+#    This also prompted me to fix a fairly long-standing usability issue -
+#    that of being able to turn off certain filters.
+#
+# Revision 1.27  2001/10/20 23:44:27  richard
+# Hyperdatabase sorts strings-that-look-like-numbers as numbers now.
+#
+# Revision 1.26  2001/10/16 03:48:01  richard
+# admin tool now complains if a "find" is attempted with a non-link property.
+#
 # Revision 1.25  2001/10/11 00:17:51  richard
 # Reverted a change in hyperdb so the default value for missing property
 # values in a create() is None and not '' (the empty string.) This obviously