Changeset 33260 for trunk

Timestamp:

Feb 14, 2012, 12:19:01 PM (14 years ago)

Author:

rhenders

Message:

Changes to support a new Config class that encapuslates the xml config file

File:

• trunk/ippToPsps/jython/pollOdm.py (modified) (4 diffs)

trunk/ippToPsps/jython/pollOdm.py

@@ -9 +9 @@
 
 import logging.config
+
+from config import Config
 from pslogger import PSLogger
 from ipptopspsdb import IppToPspsDb
@@ -20 +22 @@
   
     if stage == "unloaded":
-        ids = ippToPspsDb.getUnloadedBatchIDs(EPOCH, DVOLABEL, batchType)
+        ids = ippToPspsDb.getUnloadedBatchIDs(config.epoch, config.dvoLabel, batchType)
     elif stage == "unmergeworthy":
-        ids = ippToPspsDb.getUnmergeWorthyBatchIDs(EPOCH, DVOLABEL, batchType)
+        ids = ippToPspsDb.getUnmergeWorthyBatchIDs(config.epoch, config.dvoLabel, batchType)
     elif stage == "unmerged":
-        ids = ippToPspsDb.getUnmergedBatchIDs(EPOCH, DVOLABEL, batchType)
+        ids = ippToPspsDb.getUnmergedBatchIDs(config.epoch, config.dvoLabel, batchType)
 
     logger.infoTitle("Checking %d %s %s batches" % (len(ids), stage, batchType))
@@ -74 +76 @@
 '''
 if len(sys.argv) > 3: 
-    CONFIG  = sys.argv[1]
+    CONFIGPATH  = sys.argv[1]
     BATCHTYPE = sys.argv[2]
     STAGE = sys.argv[3]
@@ -87 +89 @@
     SECONDS = None
 
-# open config file
-configDoc = ElementTree(file=CONFIG)
-
-# set up logging
-logging.setLoggerClass(PSLogger)
-logger = logging.getLogger(sys.argv[0])
-logger.setup(configDoc, sys.argv[0])
-
-ippToPspsDb = IppToPspsDb(logger, configDoc)
-odm = Odm(logger, configDoc)
-
-DVOLABEL = configDoc.find("dvo/gpc1Label").text
-EPOCH = configDoc.find("options/epoch").text
+# create objects
+config = Config(CONFIGPATH)
+logger = config.getLogger(sys.argv[0])
+ippToPspsDb = IppToPspsDb(logger, config)
+odm = Odm(logger, config)
 
 if STAGE == "all": stages = ['unloaded', 'unmergeworthy', 'unmerged']