Changeset 31861

Timestamp:

Jul 11, 2011, 3:44:09 PM (15 years ago)

Author:

rhenders

Message:

removed dodgy cross-database querying method getUnprocessedIDsForThisStage(); added method to return a list of processed IDs instead

File:

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

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -59 +59 @@
     TODO
     '''
-    def getUnprocessedIDsForThisStage(self, dvoDb, batchType, startDate):
-
-        if batchType == "P2": # TODO define these someplace 
-
-            stage = "cam"
-            sql = "SELECT DISTINCT stage_id \
-                   FROM gpc1.addRun \
-                   WHERE stage = '" + stage + "' \
-                   AND dvodb = '" + dvoDb + "' \
-                   AND state = 'full' \
-                   AND stage_id NOT IN "
-
-        elif batchType == "ST": 
-
-            stage = "staticsky"
-            sql = "SELECT DISTINCT stack_id \
-                   FROM gpc1.staticskyInput \
-                   JOIN gpc1.addRun ON(gpc1.staticskyInput.sky_id = gpc1.addRun.stage_id) \
-                   WHERE stage = '" + stage + "' \
-                   AND dvodb = '" + dvoDb + "' \
-                   AND state = 'full' \
-                   AND stack_id NOT IN "
-
-        sql = sql + "(SELECT stage_id \
-              FROM batch \
-              WHERE batch_type = '" + batchType + "' \
-              AND timestamp > '" + startDate + "' \
-              AND loaded_to_datastore)"
+    def getProcessedIDsForThisStage(self, batchType, startDate):
+
+        sql = "SELECT stage_id \
+               FROM batch \
+               WHERE batch_type = '" + batchType + "' \
+               AND timestamp > '" + startDate + "' \
+               AND loaded_to_datastore"
 
         ids = []
@@ -94 +73 @@
                 ids.append(rs.getInt(1))
         except:
-            self.logger.exception("Can't query for ids in DVO")
+            self.logger.exception("Can't query for processed ids in ipptopsps Db")
 
         rs.close()
 
-        self.logger.debug("Found %d unprocessed items in DVO database '%s' for stage='%s'" % (len(ids), dvoDb, stage))
+        self.logger.debug("Found %d processed and published items for batchType='%s'" % (len(ids), batchType))
 
         return ids