X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=showlatlon.py;h=951802ad15eef0975a3bb6a69685bf8462a8bdc1;hb=4d56ef5473c6486c321dd2797be45b45b0606dae;hp=af01bd7246b1d9f890af55ae96a1703d0e8c2e95;hpb=6df6b8cf9b9a5e78f4f68445e1b2dabc2ae272e6;p=monitor.git

diff --git a/showlatlon.py b/showlatlon.py
index af01bd7..951802a 100755
--- a/showlatlon.py
+++ b/showlatlon.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import plc
+from monitor.wrapper import plc, plccache
 api = plc.getAuthAPI()
 
 import sys
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
 
 import database
 import comon
-from nodecommon import color_pcu_state, datetime_fromstr
+from monitor.common import color_pcu_state, datetime_fromstr
 from nodehistory import get_filefromglob
 import time
 import traceback
@@ -83,12 +83,12 @@ def main():
 		begin = time.strftime(format)
 
 	d = datetime_fromstr(begin)
-	fbstr = get_filefromglob(d, "production.findbad")
-	fbpcustr = get_filefromglob(d, "production.findbadpcus")
+	fbstr = get_filefromglob(d, "production.findbad")[0]
+	fbpcustr = get_filefromglob(d, "production.findbadpcus")[0]
 
-	l_plcnodes = database.dbLoad("l_plcnodes")
-	l_plcsites = database.dbLoad("l_plcsites")
-	lb2hn = database.dbLoad("plcdb_lb2hn")
+	l_plcnodes = plccache.l_nodes
+	l_plcsites = plccache.l_sites
+	lb2hn = plccache.plcdb_lb2hn
 	fb = archive.load(fbstr) 
 	fbpcu = archive.load(fbpcustr)
 	reboot.fb = fbpcu