Changeset 33259 for trunk/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Feb 14, 2012, 12:02:48 PM (14 years ago)

Author:

rhenders

Message:

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

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (3 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -17 +17 @@
     Constructor
     '''
-    def __init__(self, logger, doc):
-        super(IppToPspsDb, self).__init__(logger, doc, "ipptopspsdatabase")
+    def __init__(self, logger, config):
+        super(IppToPspsDb, self).__init__(logger, config, "ipptopspsdatabase")
 
         self.MAX_FAILS = 5
@@ -590 +590 @@
     Creates a new batch. This is done with a locked table in order that no two clients can start work on the same item
     '''
-    def createNewBatch(self, batchType, stageID, survey, epoch, dvoDb, datastoreProduct, force):
+    def createNewBatch(self, batchType, stageID, config):
 
         batchID = -1;
 
-        if force or \
-            (not self.alreadyProcessed(batchType, stageID, epoch, dvoDb) \
-            and not self.processingNow(batchType, stageID, epoch, dvoDb) \
-            and not self.consistentlyFailed(batchType, stageID, epoch, dvoDb)): 
+        if config.force or \
+            (not self.alreadyProcessed(batchType, stageID, config.epoch, config.dvoLabel) \
+            and not self.processingNow(batchType, stageID, config.epoch, config.dvoLabel) \
+            and not self.consistentlyFailed(batchType, stageID, config.epoch, config.dvoLabel)): 
 
             sql = "INSERT INTO batch ( \
@@ -608 +608 @@
                        '" + batchType + "', \
                        " + str(stageID) + ", \
-                       '" + survey + "', \
-                       '" + dvoDb + "', \
-                       '" + datastoreProduct + "' \
+                       '" + config.survey + "', \
+                       '" + config.dvoLabel + "', \
+                       '" + config.datastoreProduct + "' \
                        )"