Index: trunk/ippToPsps/jython/ipptopsps.py
===================================================================
--- trunk/ippToPsps/jython/ipptopsps.py	(revision 32145)
+++ trunk/ippToPsps/jython/ipptopsps.py	(revision 32162)
@@ -54,5 +54,5 @@
     for id in ids:
 
-        if not FORCE and ippToPspsDb.alreadyProcessed(id): continue
+        if not FORCE and ippToPspsDb.alreadyProcessed(batchType, id): continue
 
         if batchType == "P2":
Index: trunk/ippToPsps/jython/ipptopspsdb.py
===================================================================
--- trunk/ippToPsps/jython/ipptopspsdb.py	(revision 32145)
+++ trunk/ippToPsps/jython/ipptopspsdb.py	(revision 32162)
@@ -294,9 +294,10 @@
     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"