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

Timestamp:

Oct 10, 2015, 12:40:44 PM (11 years ago)

Author:

eugene

Message:

make code less forgiving: sql execute aborts on failures; deal with various hidden problems: add IF EXISTS to drop table operations to avoid raising unneeded error, make sure tables exist before trying to add indexes, test for existence of the stack _xsrc, _xfit, etc tables (and skip if missing); fix sqlLine.group to cast inputs to string before performing string ops; getKeyFloat now returns a float value which is safe with sqlLine.group, but can be used in a math expression; use python math. operators as needed (sqrt, fabs); fulltest.sh runs for camera, stack, object stages; update dvoSkyTable to use REGION_ID instead of special word INDEX; add existsClient method (avoid using mysql failure as a test for table existence); no need to test for exceptions to sql.execute since we abort on failure; replace esoteric SQL with dropTable calls; trap errors in stilts.treads in setupScratchdb; drop StackObjecThin and StackDetOffMeta along with other stack scratch tables

File:

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

trunk/ippToPsps/jython/batch.py

@@ -234 +234 @@
 
     '''
-    Returns the string keyword value from this header or else "NULL"
+    Returns the float keyword value from this header or else "NULL"
     '''
     def getKeyFloat(self, header, format, key):
 
          if key in header: 
-             value = format % float(header[key])
+             value = float(format % float(header[key]))
          else:
              self.logger.errorPair("Missing header field", key)
-             value = format % -999.9
+             value = float(format % -999.9)
 
          return value
@@ -414 +414 @@
     '''   
     def createEmptyPspsTables(self):
-         print "THIS SUCKS" 
-         self.pspsTables = stilts.treads(self.pspsVoTableFilePath)
-         for table in self.pspsTables:
-             self.logger.debug("Creating PSPS table: " + table.name)
-             self.logger.infoPair("creating psps table ",table.name)
-             table.write(self.scratchDb.url + '#' + table.name)
-             self.tablesToExport.append(table.name)
-
-         return True
+        self.pspsTables = stilts.treads(self.pspsVoTableFilePath)
+        for table in self.pspsTables:
+            self.logger.debug("Creating PSPS table: " + table.name)
+            self.logger.infoPair("creating psps table ",table.name)
+            table.write(self.scratchDb.url + '#' + table.name)
+            self.tablesToExport.append(table.name)
+
+        return True
 
     '''