Changeset 32162 for trunk/ippToPsps

Timestamp:

Aug 22, 2011, 8:19:51 AM (15 years ago)

Author:

rhenders

Message:

alreadyProcessed() method now taking batch type as a parameter, as of course it always should have

Location:

trunk/ippToPsps/jython

Files:

• ipptopsps.py (modified) (1 diff)
• ipptopspsdb.py (modified) (1 diff)

trunk/ippToPsps/jython/ipptopsps.py

@@ -54 +54 @@
     for id in ids:
 
-        if not FORCE and ippToPspsDb.alreadyProcessed(id): continue
+        if not FORCE and ippToPspsDb.alreadyProcessed(batchType, id): continue
 
         if batchType == "P2":

trunk/ippToPsps/jython/ipptopspsdb.py

@@ -294 +294 @@
     Have we already processed and published this batch?
     '''
-    def alreadyProcessed(self, stage_id):
+    def alreadyProcessed(self, batchType, stage_id):
 
         sql = "SELECT COUNT(*) \
                FROM batch \
                WHERE stage_id = " + str(stage_id) + " \
+               AND batch_type = '" + batchType + "' \
                AND processed \
                AND loaded_to_datastore"