Moved some files around and merged from 1.0 branch:

[monitor.git] / printbadcsv.py

diff --git a/printbadcsv.py b/printbadcsv.py
index f064c11..2f5036d 100755 (executable)
--- a/printbadcsv.py
+++ b/printbadcsv.py
@@ -6,9 +6,7 @@ import parser as parsermodule
 from www.printbadnodes import *
 
 def main():
-       global fb
        db = database.dbLoad(config.dbname)
-       fb = database.dbLoad("findbadpcus")
        act= database.dbLoad("act_all")
 
        ## Field widths used for printing
@@ -117,13 +115,13 @@ def main():
                        print str
 
        keys = categories.keys()
-       for cat in ['BOOT-ALPHA', 'BOOT-PROD', 'BOOT-OLDBOOTCD', 'DEBUG-ALPHA',
-       'DEBUG-PROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
+       for cat in ['BOOT-PROD', 'BOOT-OLDPROD', 'BOOT-OLDBOOTCD', 'DEBUG-PROD',
+       'DEBUG-OLDPROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
                if cat not in keys:
                        categories[cat] = 0
        keys = categories.keys()
-       for cat in ['BOOT-ALPHA', 'BOOT-PROD', 'BOOT-OLDBOOTCD', 'DEBUG-ALPHA',
-       'DEBUG-PROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
+       for cat in ['BOOT-PROD', 'BOOT-OLDPROD', 'BOOT-OLDBOOTCD', 'DEBUG-PROD',
+       'DEBUG-OLDPROD', 'DEBUG-OLDBOOTCD', 'DOWN-ERROR']:
                if cat in keys:
                        print "%d," % categories[cat],
        print ""