Added dummy hooks for I18N and some preliminary (test) markup of

[roundup.git] / roundup / hyperdb.py

diff --git a/roundup/hyperdb.py b/roundup/hyperdb.py
index 5a4e837645f4e11bffea554a3f3de7ede402fd4e..f19ed358d2475a96e853e1f9d5878a779f9db558 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.31 2001-11-12 22:01:06 richard Exp $
+# $Id: hyperdb.py,v 1.34 2001-11-21 04:04:43 richard Exp $
 
 # standard python modules
 import cPickle, re, string
@@ -295,9 +295,6 @@ class Class:
             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:
@@ -307,6 +304,9 @@ class Class:
                 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):
@@ -680,17 +680,28 @@ class Class:
             # 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
@@ -849,6 +860,15 @@ def Choice(name, *options):
 
 #
 # $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
 #