X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=2d7f23e2a8d33cdea329889da8d77f942f0fc79e;hp=d4553dca58e2cb8bf31088673013d74b7cd8b439;hb=8e65cdcaaf08982f5f744297c009359ec74d31b5;hpb=3c41124c02dca2a6cf55bcd065f2b5d2af9635d6

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index d4553dc..2d7f23e 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -5,13 +5,18 @@ from turbogears import controllers, expose, flash
 # log = logging.getLogger("monitorweb.controllers")
 from monitor.database.info.model import *
 from pcucontrol import reboot
+from monitor.wrapper.plccache import plcdb_id2lb as site_id2lb
 
 def format_ports(pcu):
 	retval = []
 	if pcu.port_status and len(pcu.port_status.keys()) > 0 :
 		obj = reboot.model_to_object(pcu.plc_pcu_stats['model'])
 		for port in obj.supported_ports:
-			state = pcu.port_status[str(port)]
+			try:
+				state = pcu.port_status[str(port)]
+			except:
+				state = "unknown"
+				
 			retval.append( (port, state) )
 
 	if retval == []: 
@@ -106,6 +111,11 @@ class Root(controllers.RootController):
 			else:
 				filtercount['pending'] += 1
 				
+			try:
+				node.loginbase = site_id2lb[node.plc_pcu_stats['site_id']]
+			except:
+				node.loginbase = "unknown"
+
 			node.ports = format_ports(node)
 			node.status = format_pcu_shortstatus(node)