Changeset 33259 for trunk/ippToPsps/jython/detectionbatch.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/detectionbatch.py (modified) (9 diffs)

trunk/ippToPsps/jython/detectionbatch.py

@@ -33 +33 @@
     def __init__(self, 
                  logger,
-                 configPath,
-                 configDoc,
+                 config,
                  gpc1Db,
                  ippToPspsDb,
@@ -43 +42 @@
        super(DetectionBatch, self).__init__(
                logger,
-               configPath,
-               configDoc,
+               config,
                gpc1Db,
                ippToPspsDb,
@@ -75 +73 @@
 
        # if test mode
-       if self.testMode:
+       if self.config.test:
            self.startX = 3
            self.endX = 4
@@ -221 +219 @@
         self.scratchDb.updateFilterID("FrameMeta", self.filter)
         self.scratchDb.updateAllRows("FrameMeta", "calibModNum", str(self.calibModNum))
-        self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows("FrameMeta", "dataRelease", str(self.config.dataRelease))
 
     '''
@@ -368 +366 @@
         self.scratchDb.updateFilterID(tableName, self.filter)
         self.scratchDb.updateAllRows(tableName, "calibModNum", str(self.calibModNum))
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
         if 'NASTRO' in header: self.totalNumPhotoRef = self.totalNumPhotoRef + int(header['NASTRO'])
         self.scratchDb.replaceNullsInThisColumn(tableName, "polyOrder", "0")
@@ -455 +453 @@
                , '" + self.dateStr + "' \
                , 0 \
-               , " + str(self.dataRelease) + "\
+               , " + str(self.config.dataRelease) + "\
                FROM " + ippTableName
         self.scratchDb.execute(sql)
@@ -499 +497 @@
         self.scratchDb.execute(sql)
 
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
 
     '''
@@ -528 +526 @@
 
         self.scratchDb.updateAllRows(tableName, "calibModNum", str(self.calibModNum))
-        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.dataRelease))
+        self.scratchDb.updateAllRows(tableName, "dataRelease", str(self.config.dataRelease))
 
 
@@ -752 +750 @@
     def importIppTables(self, filter=""):
 
-       if self.testMode: regex = "XY33.psf"
+       if self.config.test: regex = "XY33.psf"
        else : regex = ".*.psf"