Changeset 33352 for trunk/ippToPsps

Timestamp:

Feb 23, 2012, 4:15:22 PM (14 years ago)

Author:

rhenders

Message:

new arg of scratch Db name for dvograbber program; now being passed ScratchDb rather than creating it

File:

• trunk/ippToPsps/jython/batch.py (modified) (6 diffs)

trunk/ippToPsps/jython/batch.py

@@ -21 +21 @@
 
 '''
-Base class of all batch types.
+Abstract base class of all batch types.
 '''
 class Batch(object):
@@ -33 +33 @@
                  gpc1Db,
                  ippToPspsDb,
+                 scratchDb,
                  id,
                  batchID,
@@ -55 +56 @@
         self.gpc1Db = gpc1Db
         self.ippToPspsDb = ippToPspsDb
+        self.scratchDb = scratchDb
         self.batchType = batchType;
         self.pspsVoTableFilePath = "../config/" + batchType + "/tables.vot"
@@ -73 +75 @@
                return
 
-        self.scratchDb = ScratchDb(logger, self.config, self.useFullTables)
-
-        if not self.scratchDb.everythingOK: return
+        self.scratchDb.setUseFullTables(self.useFullTables)
 
         # TODO
@@ -488 +488 @@
 
         # TODO path to DVO prog hardcoded temporarily
-        cmd = "../src/dvograbber " + self.config.path + " " + self.config.dvoLocation
+        cmd = "../src/dvograbber " + self.config.settingsPath + " " + self.scratchDb.dbName + " " + self.config.dvoLocation
         self.logger.infoPair("Running DVO", cmd)
         p = Popen(cmd, shell=True, stdout=PIPE)
@@ -534 +534 @@
                         Batch.publishToDatastore(self.datastore, self.batchID, self.batchName, self.subDir, tarballFile)
 
-                if self.config.reportNulls: self.reportNullsInAllPspsTables(False)
-
 from datastore import Datastore