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

Author: Alexander Smishlajev

roundup/backends/back_anydbm.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-#$Id: back_anydbm.py,v 1.179.2.2 2005-01-04 03:25:24 richard Exp $
+#$Id: back_anydbm.py,v 1.179.2.3 2005-01-06 17:59:38 a1s Exp $
 '''This module defines a backend that saves the hyperdatabase in a
 database chosen by anydbm. It is guaranteed to always be available in python
 versions >2.1.1 (the dumbdbm fallback in 2.1.1 and earlier has several
@@ -287,12 +287,6 @@ def setnode(self, classname, nodeid, node):
         '''
         self.dirtynodes.setdefault(classname, {})[nodeid] = 1
 
-        # update the activity time (dupe so we don't affect
-        # calling code's node assumptions)
-        node = node.copy()
-        node['activity'] = date.Date()
-        node['actor'] = self.getuid()
-
         # can't set without having already loaded the node
         self.cache[classname][nodeid] = node
         self.savenode(classname, nodeid, node)
@@ -1249,6 +1243,10 @@ def set_inner(self, nodeid, **propvalues):
         if not propvalues:
             return propvalues
 
+        # update the activity time
+        node['activity'] = date.Date()
+        node['actor'] = self.db.getuid()
+
         # do the set, and journal it
         self.db.setnode(self.classname, nodeid, node)
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.142.2.1 2005-01-04 03:28:07 richard Exp $
+# $Id: rdbms_common.py,v 1.142.2.2 2005-01-06 17:58:52 a1s Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -767,20 +767,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()
 
@@ -1529,6 +1524,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 = {}
 
@@ -1695,6 +1693,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)