X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Fcontrollers.py;h=68f9d6a4d69b4de5ac6da151bb842e9897333bb2;hb=9b360f2de6da94fbc492b48ae0277892bddf7aa9;hp=7cbaf4fa8741247a9eec7e65fe1acf88eeeedbac;hpb=6a452e8ece2ca8a47105c128eaebc38507bc76c5;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/controllers.py b/web/MonitorWeb/monitorweb/controllers.py
index 7cbaf4f..68f9d6a 100644
--- a/web/MonitorWeb/monitorweb/controllers.py
+++ b/web/MonitorWeb/monitorweb/controllers.py
@@ -8,9 +8,9 @@ import cherrypy
 # log = logging.getLogger("monitorweb.controllers")
 import re
 from monitor.database.info.model import *
-from monitor.database.zabbixapi.model import *
-from monitor.database.dborm import zab_session as session
-from monitor.database.dborm import zab_metadata as metadata
+#from monitor.database.zabbixapi.model import *
+#from monitor.database.dborm import zab_session as session
+#from monitor.database.dborm import zab_metadata as metadata
 from monitor_xmlrpc import MonitorXmlrpcServer
 
 from monitor import reboot
@@ -137,6 +137,8 @@ def prep_node_for_display(node):
 		if node.site is None:
 			# TODO: need a cleaner fix for this...
 			node.site = HistorySiteRecord.by_loginbase("pl")
+                        if not node.site:
+                                node.site = HistorySiteRecord.by_loginbase("ple")
 			
 
 	node.history = HistoryNodeRecord.by_hostname(node.hostname)
@@ -162,10 +164,10 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 	def nodeview(self, hostname=None):
 		nodequery=[]
 		if hostname:
-			for node in FindbadNodeRecord.get_latest_by(hostname=hostname):
-				# NOTE: reformat some fields.
-				prep_node_for_display(node)
-				nodequery += [node]
+                        node = FindbadNodeRecord.get_latest_by(hostname=hostname)
+                        # NOTE: reformat some fields.
+                        prep_node_for_display(node)
+                        nodequery += [node]
 
 		return self.pcuview(None, None, hostname) # dict(nodequery=nodequery)
 
@@ -180,7 +182,8 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			# NOTE: reformat some fields.
 			prep_node_for_display(node)
 
-			node.history.status
+			#node.history.status
+			print node.hostname
 
 			if node.history.status in ['down', 'offline']:
 				if node.plc_node_stats and node.plc_node_stats['last_contact'] != None:
@@ -192,7 +195,11 @@ class Root(controllers.RootController, MonitorXmlrpcServer):
 			elif node.history.status in ['debug', 'monitordebug']:
 				filtercount['debug'] += 1
 			else:
-				filtercount[node.history.status] += 1
+                                # TODO: need a better fix. filtercount
+                                # doesn't maps to GetBootStates() on
+                                # 4.3 so this one fails quite often.
+                                if filtercount.has_key(node.history.status):
+                                        filtercount[node.history.status] += 1
 				
 			## NOTE: count filters
 			#if node.observed_status != 'DOWN':