Changeset 31934

Timestamp:

Jul 25, 2011, 1:53:40 PM (15 years ago)

Author:

rhenders

Message:

cleaner exit from failed batch

File:

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

trunk/ippToPsps/jython/batch.py

@@ -332 +332 @@
               self.logger.exception("Problem writing table '" + table.name + "' to the database")
 
-
       self.logger.infoPair("Done. Imported", "%d tables" % count)
       self.indexIppTables()
@@ -408 +407 @@
     def getIDsFromDVO(self):
 
+        if self.scratchDb.getRowCount("dvoMeta") < 1:
+            self.logger.error("No DVO IDs found in dvoMeta")
+            return False
+
         # TODO path to DVO prog hardcoded temporarily
         cmd = "../src/dvograbber " + self.dvoLocation
@@ -434 +437 @@
     def run(self):
 
-        if not self.everythingOK: return
+        if not self.everythingOK:
+            self.logger.error("Aborting this batch due to (hopefully) previously reported errors")
+            return
 
         self.createEmptyPspsTables()