Changeset 2cffcc in indico

Timestamp:

10/21/10 10:33:56 (3 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

new-webex

Children:

7fb95e

Parents:

54fef7

git-author:

Kevin Flannery <flannery@…> (05/28/10 17:11:14)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (10/21/10 10:33:56)

Message:

Fixed fossilization for participants. Participants now works

Location:

indico/MaKaC/plugins/Collaboration/WebEx

Files:

• collaboration.py (modified) (6 diffs)
• common.py (modified) (2 diffs)
• fossils.py (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/WebEx/collaboration.py

@@ -46 +46 @@
 
 from MaKaC.plugins.Collaboration.WebEx.fossils import ICSBookingIndexingFossil, ICSBookingConfModifFossil
-from MaKaC.common.fossilize import fossilizes
+from MaKaC.common.fossilize import fossilizes, fossilize
 from MaKaC.plugins.Collaboration.fossils import ICSBookingBaseConfModifFossil
 
@@ -114 +114 @@
     def getParticipants(self):
         Logger.get('WebEx').debug( "In getParticipants" )
-        return self.getParticipantList(sorted = True)
+        return fossilize(self.getParticipantList(sorted = True))
         
     def setParticipants(self, participants):
@@ -262 +262 @@
         if self._created:
 ###############
-            self._canBeStarted = True
-            return True 
+#            self._canBeStarted = True
+#            return True 
 ##########Remove above here; in for testing
             now = nowutc()
@@ -570 +570 @@
             except WebExControlledException, e:                
                 raise WebExException(_("Information could not be retrieved due to a problem with the EVO Server\n.The EVO Server sent the following error message: ") + e.message, e)
+            return None
 
     def _delete(self):
@@ -634 +635 @@
 #                        Logger.get('EVO').error(
 #                            """Could not send EVOMeetingRemovalNotificationManager for booking with id %s , exception: %s""" % (self._id, str(e)))
-                
+
             except WebExControlledException, e:                
                 if e.message == "DELETE_MEETING_OVER":
@@ -644 +645 @@
                 else:
                     return WebExError( userMessage = "The booking could not be deleted due to a problem with the WebEx Server" )
-                    raise WebExException(_("The booking could not be deleted due to a problem with the EVO Server\n.The EVO Server sent the following error message: ") + e.message, e)
+#                    raise WebExException(_("The booking could not be deleted due to a problem with the EVO Server\n.The EVO Server sent the following error message: ") + e.message, e)
                 
         self._error = False
+        return None
         
         

indico/MaKaC/plugins/Collaboration/WebEx/common.py

@@ -167 +167 @@
         return "WebEx Error: " + str(self._errorType) + " for request " + str(self._requestURL)
         
-#class Participant(Persistent, Fossilizable):
 class Participant(Persistent,Fossilizable):
     fossilizes(IParticipantFossil)
@@ -224 +223 @@
             result.append(self._affiliation)
             result.append(')')
-        return ("".join(result))[:31] #31 is the max length accepted by the MCU
+        return ("".join(result))
     
 class OverlappedError(WebExError):

indico/MaKaC/plugins/Collaboration/WebEx/fossils.py

@@ -52 +52 @@
     def getId(self):
         pass
-    getId.name = "participantId"
+#    getId.name = "participantId"
 
     def getParticipantName(self):
         pass
-
-#    def getDisplayName(self):
-#        pass
-
-    def getParticipantType(self):
-        pass
-
-#    def getParticipantProtocol(self):
-#        pass
-
-#    def getCallState(self):
-#        pass
 
     def getTitle(self):