Changeset 32002

Timestamp:

Aug 3, 2011, 12:44:36 PM (15 years ago)

Author:

rhenders

Message:

improved logic for determining processed and failed items

Location:

trunk/ippToPsps/jython

Files:

• ipptopspsdb.py (modified) (2 diffs)
• metrics.py (modified) (2 diffs)

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -59 +59 @@
     TODO
     '''
-    def getProcessedIDsForThisStage(self, batchType, startDate):
+    def getProcessedIDsForThisStage(self, batchType, epoch, dvoGpc1Label):
 
         sql = "SELECT DISTINCT stage_id \
                FROM batch \
                WHERE batch_type = '" + batchType + "' \
-               AND timestamp > '" + startDate + "' \
+               AND timestamp > '" + epoch + "' \
+               AND dvo_db = '" + dvoGpc1Label + "' \
                AND loaded_to_datastore"
 
@@ -157 +158 @@
     TODO
     '''
-    def getFailedBatches(self, batchType, startTime, endTime=""):
+    def getFailedBatches(self, batchType, epoch, dvoGpc1Label):
 
         sql = "SELECT DISTINCT stage_id \
                FROM batch \
-               WHERE timestamp > '" + startTime + "' \
+               WHERE timestamp > '" + epoch + "' \
                AND batch_type = '" + batchType + "' \
+               AND dvo_db = '" + dvoGpc1Label + "' \
                AND !processed"
 

trunk/ippToPsps/jython/metrics.py

@@ -17 +17 @@
 
     allIDs = gpc1Db.getIDsInThisDVODbForThisStage(dvoGpc1Label, batchType)
-    processedIDs = ippToPspsDb.getProcessedIDsForThisStage(batchType, epoch)
-    failedIDs = ippToPspsDb.getFailedBatches(batchType, epoch)
+    processedIDs = ippToPspsDb.getProcessedIDsForThisStage(batchType, epoch, dvoGpc1Label)
+    failedIDs = ippToPspsDb.getFailedBatches(batchType, epoch, dvoGpc1Label)
     unprocessedIDs = list(set(allIDs) - set(processedIDs))
 
@@ -25 +25 @@
                 len(allIDs), 
                 len(processedIDs), 
-                len(list(set(failedIDs) - set(allIDs))), 
+                len(list(set(failedIDs) - set(processedIDs))), 
                 len(unprocessedIDs), 
                 ippToPspsDb.getLastBatchPublished(batchType)))