Changeset 33787 for trunk/ippToPsps/jython/batch.py

Timestamp:

Apr 16, 2012, 12:18:37 PM (14 years ago)

Author:

rhenders

Message:

improvements to exception handling

File:

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

trunk/ippToPsps/jython/batch.py

@@ -39 +39 @@
                  useFullTables): 
 
-        self.everythingOK = False
         self.readHeader = False
         self.config = config
@@ -66 +65 @@
             if not self.header: 
                 logger.errorPair("Could not read FITS for id", "%d" % id)
-                return
+                raise
 
         self.scratchDb.setUseFullTables(self.useFullTables)
@@ -115 +114 @@
         self.logger.infoPair("Output path", self.localOutPath)
 
-        self.everythingOK = True
     
     '''
@@ -510 +508 @@
     def run(self):
 
-        if not self.everythingOK:
-            self.logger.errorPair("Aborting this batch", "could not initialize")
-            self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return
-
         if not self.createEmptyPspsTables():
             self.logger.errorPair("Aborting this batch", "could not create empty PSPS tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return
+            raise
 
         if not self.importIppTables():
             self.logger.errorPair("Aborting this batch", "could not import IPP tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return
+            raise
 
         if not self.populatePspsTables():
             self.logger.errorPair("Aborting this batch", "unable to populate PSPS tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return 
+            raise 
 
         if not self.exportPspsTablesToFits():
             self.logger.errorPair("Aborting this batch", "unable to export tables to FITS file")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)
-            return 
+            raise 
    
         if self.writeBatchManifest():