Changeset 31808

Timestamp:

Jul 1, 2011, 8:49:25 AM (15 years ago)

Author:

rhenders

Message:

added stage_id column to batch table which is either cam_id or stack_id depending on batch type; simplified alreadyProcessed() method using new stage_id column

File:

• trunk/ippToPsps/jython/ipptopspsdb.py (modified) (6 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -23 +23 @@
     Creates a new batch
     '''
-    def createNewBatch(self, batchType, survey, dvoDb, datastoreProduct):
+    def createNewBatch(self, batchType, stageID, survey, dvoDb, datastoreProduct):
 
         sql = "INSERT INTO batch ( \
                batch_type, \
+               stage_id, \
                survey, \
                dvo_db, \
@@ -32 +33 @@
                ) VALUES ( \
                '" + batchType + "', \
+               " + str(stageID) + ", \
                '" + survey + "', \
                '" + dvoDb + "', \
@@ -91 +93 @@
     Have we already processed and published this batch?
     '''
-    def alreadyProcessed(self, table, col, value):
+    def alreadyProcessed(self, stage_id):
 
-        sql = "SELECT COUNT(*) FROM \
-               " + table + " \
-               JOIN batch USING(batch_id) \
-               WHERE " + col + " = " + str(value) + " \
+        sql = "SELECT COUNT(*) \
+               FROM batch \
+               WHERE stage_id = " + str(stage_id) + " \
                AND processed \
                AND loaded_to_datastore"
@@ -104 +105 @@
             rs.first()
             if rs.getInt(1) > 0: 
-                self.logger.error("Batch with "+col+" = "+str(value)+" has already been processed and published to datastore")
+                self.logger.error("Batch with stage_id = "+str(stage_id) + " has already been processed and published to datastore")
                 return True
             else: 
@@ -133 +134 @@
     Inserts some stack metadata for this batch ID
     '''
-    def insertStackMeta(self, batchID, skyID, stackID, filter, stackType):
+    def insertStackMeta(self, batchID, stackID, filter, stackType):
 
         sql = "INSERT INTO stack ( \
                batch_id \
-               ,sky_id \
                ,stack_id \
                ,filter \
@@ -143 +143 @@
                ) VALUES ( \
                " + str(batchID) + " \
-               ," + str(skyID) + " \
                ," + str(stackID) + " \
                ,'" + filter + "' \