Changeset 37156 for branches/eam_branches/ipp-20140717/ippToPsps/jython/loader.py

Timestamp:

Jul 31, 2014, 10:59:37 AM (12 years ago)

Author:

eugene

Message:

adding stack mags to dvopsps detection output; adding option to reset the dvoDetections table; adding makeEquals to sqlUtilities; intelligently(?) select photcode ranges for dvopsps; massive re-work of stackbatch.py

File:

• branches/eam_branches/ipp-20140717/ippToPsps/jython/loader.py (modified) (3 diffs)

branches/eam_branches/ipp-20140717/ippToPsps/jython/loader.py

@@ -162 +162 @@
 
                     if batchType != "OB":
-                        if not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
+                        if self.config.resetDvo or not self.ippToPspsDb.isBoxIngested(boxId, self.scratchDb.dbHost):
                             if not self.dvoDetections.nativeIngestDetections(boxId, boxDim):
                                 self.logger.error("Unable to ingest detections with nativeIngest")
@@ -206 +206 @@
             self.ippToPspsDb.unlockTables()
             #self.logger.infoPair("heather:","unlock table")
-            self.ippToPspsDb.deletePendingItem(batchType, id)
+            # self.ippToPspsDb.deletePendingItem(batchType, id)
             #self.logger.infoPair("heather:","deleted pending item")
 
@@ -288 +288 @@
                 self.logger.error("EXCEPTION: " + str(e))
                 self.logger.errorPair("Problem with this %s batch (%d)" % (batchType, id), "skipping")
+                sys.exit(1)
                 pass