Changeset d44cf5 in indico

Timestamp:

09/11/09 14:49:18 (4 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

e64ab6

Parents:

6228d9

Message:

[FIXED] Unhandled exception

File:

• indico/MaKaC/plugins/Collaboration/CERNMCU/pages.py (modified) (11 diffs)

indico/MaKaC/plugins/Collaboration/CERNMCU/pages.py

@@ -33 +33 @@
 
 class WNewBookingForm(WCSPageTemplateBase):
-        
+
     def getVars(self):
         vars = WCSPageTemplateBase.getVars( self )
-        
+
         vars["EventTitle"] = self._conf.getTitle()
         vars["EventDescription"] = unescape_html(strip_ml_tags( self._conf.getDescription())).strip()
@@ -43 +43 @@
         vars["MinStartDate"] = formatDateTime(self._conf.getAdjustedStartDate())
         vars["MaxEndDate"] = formatDateTime(self._conf.getAdjustedEndDate())
-        
+
         return vars
 
 class WMain (WJSBase):
-    
+
     def getVars(self):
         vars = WJSBase.getVars( self )
-    
+
         vars["MinStartDate"] = formatDateTime(self._conf.getAdjustedStartDate())
         vars["MaxEndDate"] = formatDateTime(self._conf.getAdjustedEndDate())
-        
+
         location = self._conf.getLocation()
         room = self._conf.getRoom()
@@ -64 +64 @@
             else:
                 vars["InitialRoomInstitution"] = ""
-            
+
             # TODO: get IP of room from a plugin option instead of querying RB DB every time
             try:
@@ -72 +72 @@
                     CrossLocationDB.connect()
                     Logger.get("CERNMCU").info("Connection successful")
-                    
+
                     attName = getCERNMCUOptionValueByName("H323_IP_att_name")
-                    
+
                     returnedRooms = CrossLocationQueries.getRooms( location = location.getName(), roomName = room.getName() )
+
                     if isinstance(returnedRooms, list):
-                        returnedRoom = returnedRooms[0]
+                        if len(returnedRooms) == 0:
+                            returnedRoom = None
+                        else:
+                            returnedRoom = returnedRooms[0]
                     else:
                         returnedRoom = returnedRooms
-                    if attName in returnedRoom.customAtts:
+
+                    if (returnedRoom != None) and \
+                           (attName in returnedRoom.customAtts):
+
                         initialRoomIp = returnedRoom.customAtts[attName]
                         if (initialRoomIp.strip() == ""):
                             vars["IPRetrievalResult"] = 1
                         elif not validIP(initialRoomIp):
-                            vars["IPRetrievalResult"] = 2                    
+                            vars["IPRetrievalResult"] = 2
                         else:
                             vars["IPRetrievalResult"] = 0
-                        
+
                     else:
                         initialRoomIp = "IP not defined for this room."
@@ -96 +103 @@
                     vars["IPRetrievalResult"] = 3
                     Logger.get("CERNMCU").info("Tried to retrieve a room's H323 IP, but Room Booking module was not active.")
-                        
+
             except MaKaCError, e:
                 initialRoomIp = "IP not found."
                 vars["IPRetrievalResult"] = 4
                 Logger.get("CERNMCU").warning("Problem when retrieving a room's H.323 IP: " + e.getMsg())
-                    
-            
+
+
             vars["InitialRoomIP"] = initialRoomIp
-            
+
         else:
             vars["IncludeInitialRoom"] = False
@@ -111 +118 @@
             vars["InitialRoomInstitution"] = ""
             vars["InitialRoomIP"] = ""
-        
+
         vars["CERNGatekeeperPrefix"] = getCERNMCUOptionValueByName("CERNGatekeeperPrefix")
         vars["GDSPrefix"] = getCERNMCUOptionValueByName("GDSPrefix")
         vars["MCU_IP"] = getCERNMCUOptionValueByName("MCU_IP")
         vars["Phone_number"] = getCERNMCUOptionValueByName("Phone_number")
-    
-        return vars
-    
+
+        return vars
+
 class WIndexing(WJSBase):
     pass
-    
+
 class WExtra (WJSBase):
     def getVars(self):
         vars = WJSBase.getVars( self )
-        
+
         roomsWithH323IP = []
-        
+
         if self._conf:
-            location = self._conf.getLocation() 
-            
+            location = self._conf.getLocation()
+
             if location:
-            
+
                 # TODO: get list of room from a plugin option instead of querying the RB DB everytime
                 try:
@@ -140 +147 @@
                         CrossLocationDB.connect()
                         Logger.get("CERNMCU").info("Connection successful")
-                        
+
                         attName = getCERNMCUOptionValueByName("H323_IP_att_name")
-                        
-                        
+
+
                         returnedRooms = CrossLocationQueries.getRooms( location = location.getName(),
                                                                        customAtts = [{"name":attName, "allowEmpty":False,
@@ -149 +156 @@
                         if not isinstance(returnedRooms, list):
                             returnedRooms = [returnedRooms]
-        
+
                         for room in returnedRooms:
                             roomsWithH323IP.append(RoomWithH323(location.getName(), room._getName(), room.customAtts[attName]))
-                            
+
                 except MaKaCError, e:
                     Logger.get("CERNMCU").warning("Problem when retrieving the list of all rooms with a H323 IP: " + e.getMsg())
-        
+
         vars["RoomsWithH323IP"] = roomsWithH323IP
         return vars
-    
+
 class WStyle (WCSCSSBase):
     pass
 
 class WInformationDisplay(WCSPageTemplateBase):
-    
+
     def __init__(self, booking, displayTz):
         WCSPageTemplateBase.__init__(self, booking.getConference(), 'CERNMCU', None)
         self._booking = booking
         self._displayTz = displayTz
-    
+
     def getVars(self):
         vars = WCSPageTemplateBase.getVars( self )
-        
+
         vars["Booking"] = self._booking
-        
+
         vars["CERNGatekeeperPrefix"] = getCERNMCUOptionValueByName("CERNGatekeeperPrefix")
         vars["GDSPrefix"] = getCERNMCUOptionValueByName("GDSPrefix")
         vars["MCU_IP"] = getCERNMCUOptionValueByName("MCU_IP")
         vars["Phone_number"] = getCERNMCUOptionValueByName("Phone_number")
-        
+
         return vars
 
 
 class XMLGenerator(object):
-    
+
     @classmethod
     def getDisplayName(cls):
         return "MCU"
-            
+
     @classmethod
     def getCustomBookingXML(cls, booking, displayTz, out):
-                        
+
         out.openTag("information")
-        
+
         if booking.getHasPin():
             out.openTag("section")
@@ -198 +205 @@
             out.writeTag("line", _('This conference is protected by a PIN'))
             out.closeTag("section")
-        
+
         out.openTag("section")
         out.writeTag("title", _('Description:'))
         out.writeTag("line", booking._bookingParams["description"])
         out.closeTag("section")
-        
+
         out.openTag("section")
         out.writeTag("title", _('Participants:'))
@@ -212 +219 @@
             out.writeTag("line", _("No participants yet"))
         out.closeTag("section")
-        
+
         bookingIdInMCU = str(booking._bookingParams["id"])
         out.openTag("section")
@@ -241 +248 @@
         ]))
         out.closeTag("section")
-        
+
         out.closeTag("information")
-        
+