actor/activity update moved from Database.setnode() to Class.set_inner()

Author: Alexander Smishlajev

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.144 2005-01-04 03:27:04 richard Exp $
+# $Id: rdbms_common.py,v 1.145 2005-01-06 17:35:34 a1s Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -459,7 +459,7 @@ def determine_all_columns(self, spec):
 
         """
         cols, mls = self.determine_columns(spec.properties.items())
-        
+
         # add on our special columns
         cols.append(('id', 'INTEGER PRIMARY KEY'))
         cols.append(('__retired__', 'INTEGER DEFAULT 0'))
@@ -774,20 +774,15 @@ def setnode(self, classname, nodeid, values, multilink_changes={}):
         ''' Change the specified node.
         '''
         if __debug__:
-            self.config.logging.getLogger('hyperdb').debug('setnode %s%s %r'%(classname,
-                nodeid, values))
+            self.config.logging.getLogger('hyperdb').debug('setnode %s%s %r'
+                % (classname, nodeid, values))
 
         # clear this node out of the cache if it's in there
         key = (classname, nodeid)
         if self.cache.has_key(key):
             del self.cache[key]
             self.cache_lru.remove(key)
 
-        # add the special props
-        values = values.copy()
-        values['activity'] = date.Date()
-        values['actor'] = self.getuid()
-
         cl = self.classes[classname]
         props = cl.getprops()
 
@@ -1536,6 +1531,9 @@ def set_inner(self, nodeid, **propvalues):
             raise IndexError, 'Requested item is retired'
         num_re = re.compile('^\d+$')
 
+        # make a copy of the values dictionary - we'll modify the contents
+        propvalues = propvalues.copy()
+
         # if the journal value is to be different, store it in here
         journalvalues = {}
 
@@ -1702,6 +1700,10 @@ def set_inner(self, nodeid, **propvalues):
         if not propvalues:
             return propvalues
 
+        # update the activity time
+        propvalues['activity'] = date.Date()
+        propvalues['actor'] = self.db.getuid()
+
         # do the set, and journal it
         self.db.setnode(self.classname, nodeid, propvalues, multilink_changes)