Changeset 31978 for trunk/ippToPsps/jython/ipptopsps.py

Timestamp:

Aug 2, 2011, 4:13:06 PM (15 years ago)

Author:

rhenders

Message:

now, batch types to be queued are set in config, not the command-line

File:

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

trunk/ippToPsps/jython/ipptopsps.py

@@ -67 +67 @@
 '''
 
-# check to see if we have a batch type
-if len(sys.argv) > 1: BATCHTYPE  = sys.argv[1]
-else: BATCHTYPE = "ALL"
-
 # set up logging
 logging.config.fileConfig("logging.conf")
@@ -91 +87 @@
 EPOCH = configDoc.find("options/epoch").text
 PUBLISH = int(configDoc.find("options/publishToDatastore").text)
+QUEUE_P2 = int(configDoc.find("options/publishToDatastore").text)
+QUEUE_ST = int(configDoc.find("options/publishToDatastore").text)
 
 # prompt user: FORCE and PUBLISH is a dangerous combination
@@ -99 +97 @@
 # print info to log
 logger.infoSeparator()
-logger.infoPair("Batch type", BATCHTYPE)
 logger.infoPair("Loading epoch", EPOCH)
-logger.infoPair("Forcing?", "%d" % FORCE)
-logger.infoPair("Test mode?", "%d" % TEST)
 logger.infoPair("DVO gpc1 label", DVOGPC1LABEL)
+logger.infoBool("Queuing P2 batches?", QUEUE_P2)
+logger.infoBool("Queuing ST batches?", QUEUE_ST)
+logger.infoBool("Forcing?", "%d" % FORCE)
+logger.infoBool("Test mode?", "%d" % TEST)
+logger.infoBool("Publishing?", PUBLISH)
 
 '''
@@ -117 +117 @@
 
     # queue all items for all batch types, sequentially
-    if BATCHTYPE == "ALL":
-        queueItems("P2")
-        queueItems("ST")
-    # queue only items for the user-specified batch type
-    else:
-        queueItems(BATCHTYPE)
+    if QUEUE_P2: queueItems("P2")
+    if QUEUE_ST: queueItems("ST")
 
     # in the TEST mode, we quit after submitting one batch