diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
index 8c6ed345fcda4f734512c2d78ace2981f7a8bc92..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.29 2001-10-27 00:17:41 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)
if node.has_key(self.db.RETIRED_FLAG):
continue
for key, value in requirements.items():
- if node[key].lower() != value:
+ if node[key] and node[key].lower() != value:
break
else:
l.append(nodeid)
# 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
#
# $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 -