fixed retirement of items in rdbms imports [SF#841355]

fixed bug in looking up journal of newly-created items in *dbm backends

Author: Richard Jones

CHANGES.txt

@@ -11,6 +11,8 @@ Fixed:
 - fixed javascript for help window for only one checkbox case
 - Date +/- Interval now works, and Date - Date also works
 - handle socket timeout exception (thanks Marcus Priesch)
+- fixed retirement of items in rdbms imports (sf bug 841355)
+- fixed bug in looking up journal of newly-created items in *dbm backends
 
 
 2003-09-29 0.6.2

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.122.2.1 2003-08-26 00:12:28 richard Exp $
+#$Id: back_anydbm.py,v 1.122.2.2 2003-11-14 00:19:01 richard 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
@@ -508,7 +508,11 @@ def getjournal(self, classname, nodeid):
             if str(error) == "need 'c' or 'n' flag to open new db":
                 raise IndexError, 'no such %s %s'%(classname, nodeid)
             elif error.args[0] != 2:
+                # this isn't a "not found" error, be alarmed!
                 raise
+            if res:
+                # we have unsaved journal entries, return them
+                return res
             raise IndexError, 'no such %s %s'%(classname, nodeid)
         try:
             journal = marshal.loads(db[nodeid])
@@ -927,7 +931,7 @@ def export_list(self, propnames, nodeid):
             l.append(repr(value))
 
         # append retired flag
-        l.append(self.is_retired(nodeid))
+        l.append(repr(self.is_retired(nodeid)))
 
         return l
 

roundup/backends/back_bsddb.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb.py,v 1.26 2003-05-09 01:47:50 richard Exp $
+#$Id: back_bsddb.py,v 1.26.2.1 2003-11-14 00:19:01 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in BSDDB.
 '''
@@ -105,7 +105,12 @@ def getjournal(self, classname, nodeid):
             db = bsddb.btopen(os.path.join(self.dir, 'journals.%s'%classname),
                 'r')
         except bsddb.error, error:
-            if error.args[0] != 2: raise
+            if error.args[0] != 2:
+                # this isn't a "not found" error, be alarmed!
+                raise
+            if res:
+                # we have unsaved journal entries, return them
+                return res
             raise IndexError, 'no such %s %s'%(classname, nodeid)
         # more handling of bad journals
         if not db.has_key(nodeid):

roundup/backends/back_bsddb3.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_bsddb3.py,v 1.19 2003-05-09 01:47:50 richard Exp $
+#$Id: back_bsddb3.py,v 1.19.2.1 2003-11-14 00:19:02 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in BSDDB3.
 '''
@@ -105,6 +105,9 @@ def getjournal(self, classname, nodeid):
             db = bsddb3.btopen(os.path.join(self.dir, 'journals.%s'%classname),
                 'r')
         except bsddb3._db.DBNoSuchFileError:
+            if res:
+                # we have unsaved journal entries, return them
+                return res
             raise IndexError, 'no such %s %s'%(classname, nodeid)
         # more handling of bad journals
         if not db.has_key(nodeid):

roundup/backends/back_metakit.py

@@ -1,4 +1,4 @@
-# $Id: back_metakit.py,v 1.47.2.1 2003-08-26 00:12:28 richard Exp $
+# $Id: back_metakit.py,v 1.47.2.2 2003-11-14 00:19:02 richard Exp $
 '''
    Metakit backend for Roundup, originally by Gordon McMillan.
 
@@ -1178,7 +1178,7 @@ def export_list(self, propnames, nodeid):
             l.append(repr(value))
 
         # append retired flag
-        l.append(self.is_retired(nodeid))
+        l.append(repr(self.is_retired(nodeid)))
 
         return l
 

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.58.2.1 2003-08-26 00:12:28 richard Exp $
+# $Id: rdbms_common.py,v 1.58.2.2 2003-11-14 00:19:02 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1088,7 +1088,7 @@ def export_list(self, propnames, nodeid):
             elif isinstance(proptype, hyperdb.Password):
                 value = str(value)
             l.append(repr(value))
-        l.append(self.is_retired(nodeid))
+        l.append(repr(self.is_retired(nodeid)))
         return l
 
     def import_list(self, propnames, proplist):
@@ -1145,6 +1145,9 @@ def import_list(self, propnames, proplist):
         if newid is None:
             newid = self.db.newid(self.classname)
 
+        # add the node and journal
+        self.db.addnode(self.classname, newid, d)
+
         # retire?
         if retire:
             # use the arg for __retired__ to cope with any odd database type
@@ -1155,9 +1158,6 @@ def import_list(self, propnames, proplist):
                 print >>hyperdb.DEBUG, 'retire', (self, sql, newid)
             self.db.cursor.execute(sql, (1, newid))
 
-        # add the node and journal
-        self.db.addnode(self.classname, newid, d)
-
         # extract the extraneous journalling gumpf and nuke it
         if d.has_key('creator'):
             creator = d['creator']