[Commits] (morgen) Turning off child merging, and also doing a commit( ) before getting mail

[commits at osafoundation.org]

Commit by: morgen
Modified files:
chandler/parcels/osaf/views/main/Main.py 1.60 1.61
chandler/repository/persistence/XMLRepositoryView.py 1.56 1.57

Log message:
Turning off child merging, and also doing a commit( ) before getting mail
in order to minimize chance of conflicts


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/Main.py.diff?r1=text&tr1=1.60&r2=text&tr2=1.61
http://cvs.osafoundation.org/index.cgi/chandler/repository/persistence/XMLRepositoryView.py.diff?r1=text&tr1=1.56&r2=text&tr2=1.57

Index: chandler/parcels/osaf/views/main/Main.py
diff -u chandler/parcels/osaf/views/main/Main.py:1.60 chandler/parcels/osaf/views/main/Main.py:1.61
--- chandler/parcels/osaf/views/main/Main.py:1.60	Wed Sep 15 17:00:01 2004
+++ chandler/parcels/osaf/views/main/Main.py	Fri Sep 17 14:42:51 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.60 $"
-__date__ = "$Date: 2004/09/16 00:00:01 $"
+__version__ = "$Revision: 1.61 $"
+__date__ = "$Date: 2004/09/17 21:42:51 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -26,6 +26,7 @@
 import osaf.framework.webdav.Dav as Dav
 
 
+
 class MainView(View):
     """
       Main Chandler view contains event handlers for Chandler
@@ -72,7 +73,10 @@
         # Triggered from "Test | Get Mail" menu
         account = \
          Globals.repository.findPath('//parcels/osaf/mail/IMAPAccountOne')
+
+        Globals.repository.commit()
         IMAPDownloader (account).getMail()
+        Globals.repository.refresh()
 
     def onNewEvent (self, notification):
         # Create a new Content Item

Index: chandler/repository/persistence/XMLRepositoryView.py
diff -u chandler/repository/persistence/XMLRepositoryView.py:1.56 chandler/repository/persistence/XMLRepositoryView.py:1.57
--- chandler/repository/persistence/XMLRepositoryView.py:1.56	Tue Sep 14 11:08:16 2004
+++ chandler/repository/persistence/XMLRepositoryView.py	Fri Sep 17 14:42:51 2004
@@ -1,6 +1,6 @@
 
-__revision__  = "$Revision: 1.56 $"
-__date__      = "$Date: 2004/09/14 18:08:16 $"
+__revision__  = "$Revision: 1.57 $"
+__date__      = "$Date: 2004/09/17 21:42:51 $"
 __copyright__ = "Copyright (c) 2002 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -362,9 +362,11 @@
                 self._mergeNDIRTY(item, parentId, oldVersion, toVersion)
                 oldDirty &= ~Item.NDIRTY
 
-            if newDirty & oldDirty & Item.CDIRTY:
-                item._children._mergeChanges(oldVersion, toVersion)
-                oldDirty &= ~Item.CDIRTY
+            # @@@ Per Andi, commenting these out to prevent infinite recursion
+            # Instead, we'll get a VersionConflictError
+            # if newDirty & oldDirty & Item.CDIRTY:
+            #     # item._children._mergeChanges(oldVersion, toVersion)
+            #    oldDirty &= ~Item.CDIRTY
 
             if newDirty and oldDirty:
                 raise VersionConflictError, (item, newDirty, oldDirty)