Changeset 32460

Timestamp:

Sep 29, 2011, 3:20:12 PM (15 years ago)

Author:

rhenders

Message:

now taking a batch type argument at command line; using different IppToPspsDb methods for getting lists of batch IDs

File:

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

trunk/ippToPsps/jython/pollOdm.py

@@ -14 +14 @@
 
 
-if len(sys.argv) > 1: CONFIG  = sys.argv[1]
+if len(sys.argv) > 2: 
+    CONFIG  = sys.argv[1]
+    BATCHTYPE = sys.argv[2]
 else:
-    print "\n** Usage: " + sys.argv[0] + " <configPath>\n"
+    print "\n** Usage: " + sys.argv[0] + " <configPath> <batchType> [unmerged]\n"
     sys.exit(1)
 
@@ -33 +35 @@
 EPOCH = configDoc.find("options/epoch").text
 
-if len(sys.argv) > 2 and sys.argv[2] == "all":
-    ids = ippToPspsDb.getUnfinishedBatchIDs(EPOCH, DVOLABEL)
+if len(sys.argv) > 3 and sys.argv[3] == "unmerged":
+    ids = ippToPspsDb.getUnmergedBatchIDs(EPOCH, DVOLABEL, BATCHTYPE)
 else:
-    ids = ippToPspsDb.getBatchIDsUnloadedToODM(EPOCH, DVOLABEL)
+    ids = ippToPspsDb.getUnloadedBatchIDs(EPOCH, DVOLABEL, BATCHTYPE)
 
 logger.infoPair("Checking", "%d batches" % len(ids))