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

Timestamp:

Apr 19, 2013, 4:35:54 PM (13 years ago)

Author:

eugene

Message:

use MEMORY engine for dvoDetectionFull; add error handline for dvopsps; check mysql version; remove some test verbosity; check for image existence in dvoImages; skip bad batches but do not exit; fix precision issues; add -realgpc option (part of -test mode); log times in milliseconds

Location:

trunk/ippToPsps

Files:

• . (modified) (1 prop)
• jython/batch.py (modified) (8 diffs)

trunk/ippToPsps/jython/batch.py

@@ -276 +276 @@
             p = Popen(cmd, shell=True, stdout=PIPE)
             p.wait()
+            if p.returncode != 0:
+                self.logger.errorPair("error running xmllint for ", tmpPath)
+                raise
         except:
             self.logger.errorPair("Popen failed", cmd)
@@ -301 +304 @@
         p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
-
         if p.returncode != 0:
             self.logger.errorPair("tar command", "failed")
@@ -311 +313 @@
         p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
-
         if p.returncode != 0:
             self.logger.errorPair("gzip command", "failed")
@@ -415 +416 @@
 
           # drop any previous tables before import
-          #self.scratchDb.dropTable(table.name)
+          self.scratchDb.dropTable(table.name)
 
           # IPP FITS files are littered with infinities, so remove these
@@ -426 +427 @@
           try:
               table.write(self.scratchDb.url + '#' + table.name)
-              # print "wrote to mysql ", table
-              self.scratchDb.killLastConnectionID()
+              # XXX this one is not needed
+              # self.scratchDb.killLastConnectionID()
               count = count + 1
           except:
@@ -454 +455 @@
            # get everything from table
            try:
+               print "reading table from mysql ", table
                _table = stilts.tread(self.scratchDb.url + '#SELECT * FROM ' + table)
                self.scratchDb.killLastConnectionID()
@@ -518 +520 @@
         p = Popen(cmd, shell=True, stdout=PIPE)
         p.wait()
+        if p.returncode != 0:
+            self.logger.errorPair("dvograbber command", "failed")
+            return False
 
         rowCount = self.scratchDb.getRowCount("dvoDetection")
@@ -554 +559 @@
 
         if not self.populatePspsTables():
+            if self.skipBatch:
+                self.ippToPspsDb.updateProcessed(self.batchID, -1)
+                return True
+
             self.logger.errorPair("Aborting this batch", "unable to populate PSPS tables")
             self.ippToPspsDb.updateProcessed(self.batchID, -1)