Changeset 37129 for branches/eam_branches/ipp-20140717/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Jul 28, 2014, 6:20:27 AM (12 years ago)

Author:

eugene

Message:

dropping options for stilts dvo import methods; fixing a number of previously ignored errors (eg, dropping non-existent tables); allowing queue questions to strip leading and trailing spaces (so we can read from an input file); echo back the response so input from a file is clearer; re-write big sql blocks with new sql utility code; updating names in MeanObject, ObjectThin to be more consistent; add a new test code program; update detection fields to match new schema; drop the code for the old now-unused tables (detecitonCalib, SkinnyObject, etc)

Location:

branches/eam_branches/ipp-20140717/ippToPsps

Files:

• . (modified) (1 prop)
• jython/ipptopspsdb.py (modified) (9 diffs)

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

@@ -786 +786 @@
             and not self.consistentlyFailed(batchType, stageID)): 
             
-            self.logger.infoPair("heather:","passed logic")
+            # self.logger.infoPair("heather:","passed logic")
 
             sql = "INSERT INTO batch ( \
@@ -803 +803 @@
                        '" + self.skychunk.name + "' \
                        )"
-            self.logger.infoPair("heather:","sql")
+ 
+            # self.logger.infoPair("heather:",sql)
 
             self.execute(sql)
@@ -816 +817 @@
             except:
                 self.logger.exception("Unable to get batch ID")
+                self.logger.infoPair("sql:",sql)
+
                 batchID = -1
 
@@ -1017 +1020 @@
        response = raw_input(" * Name for new skychunk, or existing skychunk to edit? ")
        if response == "": return
+       response = response.strip()
        self.skychunk.name = response
 
@@ -1056 +1060 @@
            question = question +  "? "
            response = raw_input(question)
+           response = response.strip()
+           print "response: '" + response + "'"
            if response != "":
                if type.find("varchar") != -1 or type.find("timestamp") != -1: quotes = "'"
                else: quotes = ""
+               # print "UPDATE skychunk SET " + field + " = " + quotes + response + quotes + " WHERE name = '" + self.skychunk.name + "'"
                self.execute("UPDATE skychunk SET " + field + " = " + quotes + response + quotes + " WHERE name = '" + self.skychunk.name + "'")
        
@@ -1130 +1137 @@
         self.skychunk.batchTypes = []
         try:
+            # print "sql: " + sql
             rs = self.executeQuery(sql)
 
@@ -1176 +1184 @@
             if rs.getInt(26) == 1: self.skychunk.parallel = True
             self.skychunk.P2_smf_version = rs.getString(27)
+            # options: "use_new", "not_reproc", "use_original"
+
             self.skychunk.ST_cmf_version = rs.getString(28)
+            # options: not used?
+
+            # NOTE : the rs (ResultSet) class is somewhat annoying and finicky esp about timestamp values
+            # for example, rs.getTimestamp(N) fails silently if the value is not a valid time.  this is
+            # also true to getString() on the same column.  Docs for the ResultSet class can be found here:
+            # http://docs.oracle.com/javase/1.5.0/docs/api/java/sql/ResultSet.html?is-external=true
+
+            # rsmd = rs.getMetaData()
+            # print "got metadata"
+            # print "number of columns: " + str(rsmd.getColumnCount())
+            # print "label: " + rsmd.getColumnLabel(25)
+            # print "label: " + rsmd.getColumnLabel(29)
+            # print "name: " + rsmd.getColumnName(25)
+            # print "name: " + rsmd.getColumnName(29)
+            # print "typename: " + rsmd.getColumnTypeName(25)
+            # print "typename: " + rsmd.getColumnTypeName(29)
+
+            # epochStamp = rs.getTimestamp(16)
+            # print "epoch: " + epochStamp.toString()
+
+            # print "label: " + rsmd.getColumnLabel(16)
+            # print "name: " + rsmd.getColumnName(16)
+            # print "typename: " + rsmd.getColumnTypeName(16)
+
             self.skychunk.trange_start = rs.getString(29)
+            # options: "YYYY-MM-DD,HH:MM:SS" or "0000-00-00 00:00:00"
+
             self.skychunk.trange_end = rs.getString(30) 
+            # options: "YYYY-MM-DD,HH:MM:SS" or "0000-00-00 00:00:00"
 
             if self.skychunk.parallel: print "USING parallel"
@@ -1621 +1658 @@
             pass
 
-        self.execute("CREATE TEMPORARY TABLE all_pending (stage_id bigint(20), ra_bore float, dec_bore float)")
+        # XXX EAM : 20140727: for now this is not temporary (for debugging)
+        # self.execute("CREATE TEMPORARY TABLE all_pending (stage_id bigint(20), ra_bore float, dec_bore float)")
+        self.execute("CREATE TABLE all_pending (stage_id bigint(20), ra_bore float, dec_bore float)")
         for row in rows:
 
@@ -1702 +1741 @@
         try:
             rs = self.executeQuery(sql)
-            while (rs.next()): ids.append(rs.getInt(1))
+            while (rs.next()): 
+                ids.append(rs.getInt(1))
+                print "stage_id: " + str(rs.getInt(1))
         except:
             self.logger.errorPair("Can't get items in this box", sql)