Changeset 32222 for trunk/ippToPsps

Timestamp:

Aug 29, 2011, 9:35:17 PM (15 years ago)

Author:

rhenders

Message:

now checking for consistent failure before running a batch; extra args to alreadyProcessed() method

File:

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

trunk/ippToPsps/jython/ipptopsps.py

@@ -24 +24 @@
 
     batchIDs = ippToPspsDb.getProcessedButFailedDatastoreBatchIDs(EPOCH, DVOGPC1LABEL, batchType)
-    logger.infoPair("Failed load to datastore", "%d %s batches" % (len(batchIDs), batchType))
+    logger.infoPair("Failed loads to datastore", "%d %s batches" % (len(batchIDs), batchType))
 
     for batchID in batchIDs:
@@ -74 +74 @@
     for id in ids:
 
-        if not FORCE and ippToPspsDb.alreadyProcessed(batchType, id): continue
+        if not FORCE and ippToPspsDb.alreadyProcessed(batchType, id, EPOCH, DVOGPC1LABEL): continue
+        if not FORCE and ippToPspsDb.consistentlyFailed(batchType, id, EPOCH, DVOGPC1LABEL, 3): continue
 
         if batchType == "P2":