![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
index dbca83709d456c464e89514793ab0cf69f33837a..f19ed358d2475a96e853e1f9d5878a779f9db558 100644 (file)
--- a/roundup/hyperdb.py
+++ b/roundup/hyperdb.py
# 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.34 2001-11-21 04:04:43 richard Exp $
# standard python modules
import cPickle, re, string
raise IndexError
num_re = re.compile('^\d+$')
for key, value in propvalues.items():
- if not node.has_key(key):
- raise KeyError, key
-
# check to make sure we're not duplicating an existing key
if key == self.key and node[key] != value:
try:
else:
raise ValueError, 'node with key "%s" exists'%value
+ # this will raise the KeyError if the property isn't valid
+ # ... we don't use getprops() here because we only care about
+ # the writeable properties.
prop = self.properties[key]
if isinstance(prop, Link):
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)
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.
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):
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)
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)
# sort by group and then sort
for list in group, sort:
for dir, prop in list:
- # handle the properties that might be "faked"
- if not an.has_key(prop):
- an[prop] = cl.get(a_id, prop)
- av = an[prop]
- if not bn.has_key(prop):
- bn[prop] = cl.get(b_id, prop)
- bv = bn[prop]
-
# sorting is class-specific
propclass = properties[prop]
+ # handle the properties that might be "faked"
+ # also, handle possible missing properties
+ try:
+ if not an.has_key(prop):
+ an[prop] = cl.get(a_id, prop)
+ av = an[prop]
+ except KeyError:
+ # the node doesn't have a value for this property
+ if isinstance(propclass, Multilink): av = []
+ else: av = ''
+ try:
+ if not bn.has_key(prop):
+ bn[prop] = cl.get(b_id, prop)
+ bv = bn[prop]
+ except KeyError:
+ # the node doesn't have a value for this property
+ if isinstance(propclass, Multilink): bv = []
+ else: bv = ''
+
# String and Date values are sorted in the natural way
if isinstance(propclass, String):
# clean up the strings
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
#
# $Log: not supported by cvs2svn $
+# Revision 1.33 2001/11/21 03:40:54 richard
+# more new property handling
+#
+# Revision 1.32 2001/11/21 03:11:28 richard
+# Better handling of new properties.
+#
+# Revision 1.31 2001/11/12 22:01:06 richard
+# Fixed issues with nosy reaction and author copies.
+#
+# 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