Changeset 760ed2 in indico for indico/MaKaC/conference.py

Timestamp:

02/25/10 19:10:10 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, prov-dual-interface, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

90782e

Parents:

d165f1

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/25/10 19:08:14)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/25/10 19:10:10)

Message:

[FIX] Bug that caused 'replicated' minutes

• due to database conflicts, some minutes would be written several times to different locations;
• with this fix, the same file is rewritten in the worst case scenario;

File:

• indico/MaKaC/conference.py (modified) (6 diffs)

indico/MaKaC/conference.py

@@ -11102 +11102 @@
         return False
 
-    def addResource( self, newRes, forcedFileId=None ):
+    def addResource( self, newRes, forcedFileId = None ):
         newRes.setOwner( self )
         newRes.setId( str( self.__resourcesIdGen.newCount() ) )
-        newRes.archive( self._getRepository(), forcedFileId=forcedFileId )
+        newRes.archive( self._getRepository(), forcedFileId = forcedFileId )
         self.__resources[newRes.getId()] = newRes
         self.notifyModification()
@@ -11517 +11517 @@
         self.notifyModification()
 
-    def _setFile( self ):
+    def _setFile( self, forcedFileId = None ):
         #XXX: unsafe; it must be changed by mkstemp when migrating to python 2.3
         tmpFileName = tempfile.mktemp()
@@ -11526 +11526 @@
         self.file.setId("minutes")
         self.file.setName("minutes")
-        self.file.setFilePath( tmpFileName )
-        self.file.setFileName( "minutes.txt" )
-        self.file.setOwner( self )
-        self.file.archive( self._getRepository() )
-
-    def setText( self, text ):
+        self.file.setFilePath(tmpFileName)
+        self.file.setFileName("minutes.txt")
+        self.file.setOwner(self)
+        self.file.archive(self._getRepository(), forcedFileId = forcedFileId)
+
+    def setText( self, text, forcedFileId = None ):
         if self.file:
             self.file.delete()
-        self._setFile()
+        self._setFile(forcedFileId = forcedFileId)
         self.file.replaceContent( text )
         self.getOwner().notifyModification()
@@ -11690 +11690 @@
         return self.description
 
-    def archive( self, repository=None, forcedFileId=None ):
+    def archive( self, repository = None, forcedFileId = None ):
         """performs necessary operations to ensure the archiving of the
             resource. By default is doing nothing as the persistence of the
@@ -12052 +12052 @@
         self.__repository.replaceContent( self.__archivedId, newContent )
 
-    def archive( self, repository=None, forcedFileId=None ):
+    def archive( self, repository=None, forcedFileId = None ):
         if self.isArchived():
             raise Exception( _("File is already archived"))
@@ -12059 +12059 @@
         if self.filePath == "":
             return _("Nothing to archive")
-        repository.storeFile( self, forcedFileId=forcedFileId)
+        repository.storeFile( self, forcedFileId = forcedFileId)
         self.filePath = ""
         self.notifyModification()