Changeset 38837 for trunk/ippToPsps/jython/dvo.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/dvo.py (modified) (3 diffs)

trunk/ippToPsps/jython/dvo.py

@@ -167 +167 @@
             return False
 
-        self.logger.infoSeparator()
-        self.logger.infoPair("DVO SkyTable.fits file", "NOT up-to-date")        
-
-        # drop dvoSkyTable (if it exists)
-        sql = "drop TABLE dvoSkyTable"
-        try: self.scratchDb.execute(sql)
-        except: pass
+        # self.logger.infoSeparator()
+        # self.logger.infoPair("DVO SkyTable.fits file", "NOT up-to-date")        
+        # print "--- go"
+
+        self.scratchDb.dropTable("dvoSkyTable")
 
         # create dvoSkyTable 
-        sql = "CREATE TABLE dvoSkyTable (R_MIN REAL, R_MAX REAL, D_MIN REAL, D_MAX REAL, INDEX_ INT, NAME CHAR(18))"
+        sql = "CREATE TABLE dvoSkyTable (R_MIN REAL, R_MAX REAL, D_MIN REAL, D_MAX REAL, REGION_ID INT, NAME CHAR(18))"
         self.scratchDb.execute(sql)
 
@@ -196 +194 @@
         self.logger.infoPair("Adding index to", self.scratchDb.dvoSkyTable)
 
-        self.scratchDb.createIndex(self.scratchDb.dvoSkyTable, "INDEX")
+        self.scratchDb.createIndex(self.scratchDb.dvoSkyTable, "REGION_ID")
         
         self.scratchDb.setImportedThisDvoTable(path)
@@ -580 +578 @@
         self.ippToPspsDb.clearIngestedBoxes(self.scratchDb.dbHost)
         
-        if True:
-            print "*******************************************************************************"
+        if False:
             self.logger.warning("about to delete detection table and re-ingest; is this correct?")
-            #response = raw_input("(y/n) ")
-            #if response != "y":
-            #    raise
-            #self.logger.warning("Are you ABSOLUTELY sure you want to do this?")
-            #response = raw_input("(y/n) ")
-            #if response != "y":
-            #    raise
+            response = raw_input("(y/n) ")
+            if response != "y":
+                raise
+            self.logger.warning("Are you ABSOLUTELY sure you want to do this?")
+            response = raw_input("(y/n) ")
+            if response != "y":
+                raise
 
         # blow away existing dvoDetection table & re-crate