Changeset 37066 for branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/ipptopspsdb.py

Timestamp:

Jul 17, 2014, 12:30:45 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippToPsps

Files:

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

branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/ipptopspsdb.py

@@ -39 +39 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
+               AND comment = '" + self.skychunk.name + "' \
+               AND datastore_product = '" + self.skychunk.datastoreProduct + "' \
                AND merged = 1 \
                AND deleted_local = 0 \
@@ -65 +67 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
+               AND comment = '" + self.skychunk.name + "' \
+               AND datastore_product = '" + self.skychunk.datastoreProduct + "' \
                AND purged = 1 \
                AND deleted_local = 0 \
@@ -92 +96 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
+               AND comment = '" + self.skychunk.name + "' \
+               AND datastore_product = '" + self.skychunk.datastoreProduct + "' \
                AND purged = 1 \
                AND deleted_datastore = 0 \
@@ -119 +125 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
-               AND (loaded_to_ODM = -1 OR merge_worthy = 1) \
+               AND comment = '" + self.skychunk.name + "' \
+               AND datastore_product = '" + self.skychunk.datastoreProduct + "' \
+               AND (merge_worthy = 1) \
                AND deleted_datastore = 0 AND block_delete_datastore = 0"
 
@@ -144 +152 @@
                AND batch_type = '" + batchType + "' \
                AND dvo_db = '" + self.skychunk.dvoLabel + "' \
-               AND (loaded_to_ODM = -1 OR merge_worthy = 1) \
+               AND (merge_worthy = 1) \
                AND deleted_dxlayer = 0 and block_delete_dxlayer = 0"
 
@@ -1108 +1116 @@
         ,queue_ST \
         ,queue_OB \
+        ,queue_DF \
+        ,queue_DO \
+        ,queue_FW \
+        ,queue_FO \
         ,parallel \
+        ,P2_smf_version \
+        ,ST_cmf_version \
+        ,trange_start \
+        ,trange_end \
         FROM skychunk \
         WHERE name = '" + self.skychunk.name + "'"
@@ -1150 +1166 @@
             if rs.getInt(20) == 1: self.skychunk.batchTypes.append("ST")
             if rs.getInt(21) == 1: self.skychunk.batchTypes.append("OB")
+            if rs.getInt(22) == 1: self.skychunk.batchTypes.append("DF")
+            if rs.getInt(23) == 1: self.skychunk.batchTypes.append("DO")
+            if rs.getInt(24) == 1: self.skychunk.batchTypes.append("FW")
+            if rs.getInt(25) == 1: self.skychunk.batchTypes.append("FO")
 
             self.skychunk.force = True # TODO
             self.skychunk.parallel = False # TODO
 
-            if rs.getInt(22) == 1: self.skychunk.parallel = True
+            if rs.getInt(26) == 1: self.skychunk.parallel = True
+            self.skychunk.P2_smf_version = rs.getString(27)
+            self.skychunk.ST_cmf_version = rs.getString(28)
+            self.skychunk.trange_start = rs.getString(29)
+            self.skychunk.trange_end = rs.getString(30) 
 
             if self.skychunk.parallel: print "USING parallel"
@@ -1627 +1651 @@
         # self.logger.infoPair("Items written to alt Db", "%d" % count)
 
+
+    '''
+    Creates a temporary table and shoves it full of stage_ids and ra/dec coords
+    '''
+    def storeAllItemsInDvodb(self, rows, dvo_db, batchType):
+
+        #try:
+        #    self.execute("DROP TABLE all_pending")
+        #except:
+        #    pass
+
+        #self.execute("CREATE TEMPORARY TABLE all_pending (stage_id bigint(20), ra_bore float, dec_bore float)")
+        for row in rows:
+
+            try:
+                uniq = dvo_db + "."+ batchType + "." + str(row[0])
+                sql = "INSERT INTO dvodb (dvo_db, batch_type, stage_id, ra_center, dec_center, uniq_key) \
+                       VALUES ( '" + dvo_db + "', '" + batchType + "'," + str(row[0]) + "," + str(row[1]) + " \
+                       , " + str(row[2]) + ", '"+uniq+"' ) " 
+                print "sql 1: ", sql
+                self.execute(sql)
+            except: continue
+
+        #count = self.getRowCount("all_pending")
+        #self.logger.infoPair("Items written to Db", "%d" % count)
+
+
+
     '''
     Gets all items in the all_pending temporary table within the bounds of this box