Added machinery to avoid undoing transaction that started before the last pack.

lib/python/App/ApplicationManager.py

 __doc__="""System management components"""
-__version__='$Revision: 1.29 $'[11:-2]
+__version__='$Revision: 1.30 $'[11:-2]
 
 
 import sys,os,time,string,Globals
 from Globals import HTMLFile
 from OFS.ObjectManager import ObjectManager
 from CacheManager import CacheManager
-from OFS import SimpleItem
+from OFS import SimpleItem, Folder
 from App.Dialogs import MessageDialog
 
 
@@ -42,6 +42,11 @@ class ApplicationManager(ObjectManager,SimpleItem.Item,CacheManager):
     manage_delProperties=None
     isPrincipiaFolderish=0
 
+    def __init__(self):
+	self.Factories=f=Folder.Folder()
+	f.id='Factories'
+	f.title='User-defined addable objects'
+
     def copyToClipboard(self, REQUEST):
 	return Globals.MessageDialog(title='Not Supported',
 				     message='This item cannot be copied',
@@ -100,7 +105,17 @@ class ApplicationManager(ObjectManager,SimpleItem.Item,CacheManager):
 	    raise 'Session Error', (
 		'''You may not pack the application database while
 		working in a <em>session</em>''')
-	Globals.Bobobase._jar.db.pack(time.time()-days*86400,0)
+        t=time.time()-days*86400
+        if Globals.Bobobase.has_key('_pack_time'):
+            since=Globals.Bobobase['_pack_time']
+            if t <= since:
+                if REQUEST: return self.manage_main(self, REQUEST)
+                return
+
+        Globals.Bobobase['_pack_time']=t
+        get_transaction().note('')
+        get_transaction().commit()
+	Globals.Bobobase._jar.db.pack(t,0)
 	if REQUEST: return self.manage_main(self, REQUEST)
 
     def revert_points(self): return ()

lib/python/App/Undo.py

@@ -11,8 +11,8 @@
 __doc__='''short description
 
 
-$Id: Undo.py,v 1.8 1998/01/12 17:58:39 jim Exp $'''
-__version__='$Revision: 1.8 $'[11:-2]
+$Id: Undo.py,v 1.9 1998/05/14 23:21:38 jim Exp $'''
+__version__='$Revision: 1.9 $'[11:-2]
 
 import Globals
 from DateTime import DateTime
@@ -67,8 +67,13 @@ class UndoSupport:
 	r=[]
 	add=r.append
 	h=['','']
-	try:    trans_info=db.transaction_info(first_transaction,
-					       last_transaction,path)
+	try:
+            if Globals.Bobobase.has_key('_pack_time'):
+                since=Globals.Bobobase['_pack_time']
+            else: since=0
+            trans_info=db.transaction_info(
+                first_transaction,last_transaction,path,since=since)
+            
         except: trans_info=[]
 
 	for info in trans_info:
@@ -112,6 +117,9 @@ Globals.default__class_init__(UndoSupport)
 ############################################################################## 
 #
 # $Log: Undo.py,v $
+# Revision 1.9  1998/05/14 23:21:38  jim
+# Added machinery to avoid undoing transaction that started before the last pack.
+#
 # Revision 1.8  1998/01/12 17:58:39  jim
 # Additional changes to support supplying batch size as a parameter.
 #