Index: trunk/ippToPsps/jython/batch.py
===================================================================
--- trunk/ippToPsps/jython/batch.py	(revision 33351)
+++ trunk/ippToPsps/jython/batch.py	(revision 33352)
@@ -21,5 +21,5 @@
 
 '''
-Base class of all batch types.
+Abstract base class of all batch types.
 '''
 class Batch(object):
@@ -33,4 +33,5 @@
                  gpc1Db,
                  ippToPspsDb,
+                 scratchDb,
                  id,
                  batchID,
@@ -55,4 +56,5 @@
         self.gpc1Db = gpc1Db
         self.ippToPspsDb = ippToPspsDb
+        self.scratchDb = scratchDb
         self.batchType = batchType;
         self.pspsVoTableFilePath = "../config/" + batchType + "/tables.vot"
@@ -73,7 +75,5 @@
                return
 
-        self.scratchDb = ScratchDb(logger, self.config, self.useFullTables)
-
-        if not self.scratchDb.everythingOK: return
+        self.scratchDb.setUseFullTables(self.useFullTables)
 
         # TODO
@@ -488,5 +488,5 @@
 
         # 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,6 +534,4 @@
                         Batch.publishToDatastore(self.datastore, self.batchID, self.batchName, self.subDir, tarballFile)
 
-                if self.config.reportNulls: self.reportNullsInAllPspsTables(False)
-
 from datastore import Datastore