Index: trunk/ippToPsps/jython/pollOdm.py
===================================================================
--- trunk/ippToPsps/jython/pollOdm.py	(revision 32250)
+++ trunk/ippToPsps/jython/pollOdm.py	(revision 32254)
@@ -10,5 +10,4 @@
 from pslogger import PSLogger
 from ipptopspsdb import IppToPspsDb
-from gpc1db import Gpc1Db
 from odm import Odm
 from batch import Batch
@@ -29,5 +28,4 @@
 
 ippToPspsDb = IppToPspsDb(logger, configDoc)
-gpc1Db = Gpc1Db(logger, configDoc)
 odm = Odm(logger, configDoc)
 
@@ -35,7 +33,10 @@
 EPOCH = configDoc.find("options/epoch").text
 
-ids = ippToPspsDb.getProcessedButUnmergedBatchIDs(EPOCH, DVOLABEL)
+if len(sys.argv) > 2 and sys.argv[2] == "all":
+    ids = ippToPspsDb.getUnfinishedBatchIDs(EPOCH, DVOLABEL)
+else:
+    ids = ippToPspsDb.getBatchIDsUnloadedToODM(EPOCH, DVOLABEL)
 
-logger.infoPair("Processed but un-merged batches", "%d" % len(ids))
+logger.infoPair("Checking", "%d batches" % len(ids))