Changeset 32040 for trunk/ippToPsps

Timestamp:

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

Author:

rhenders

Message:

now checks the config for IDs to process. If not found, it defaults to DVO

File:

• trunk/ippToPsps/jython/ipptopsps.py (modified) (1 diff)

trunk/ippToPsps/jython/ipptopsps.py

@@ -23 +23 @@
     logger.infoTitle("Queuing " + batchType + " items")
 
-    # get list of all items available in DVO
-    allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType)
-    logger.infoPair("All %s items in DVO" % batchType, "%d" % len(allIDs))
+    allIDs = []
+
+    # see if there are any IDs listed in the config
+    try:
+        for element in configDoc.findall('options/ids/id'):
+            allIDs.append(int(element.text))
+    except:
+        logger.errorPair("Problem loading IDs from config under", "options/ids/id") 
+
+    # no config dictated IDs, so get from DVO instead
+    if len(allIDs) > 0:
+        logger.infoPair("Using config IDs (not DVO)", "%d" % len(allIDs))
+    else:
+        allIDs = gpc1Db.getIDsInThisDVODbForThisStage(DVOGPC1LABEL, batchType)
+        logger.infoPair("All %s items in DVO" % batchType, "%d" % len(allIDs))
 
     # if in FORCE mode, then queue full list
-    if FORCE: 
-        ids = allIDs
+    if FORCE: ids = allIDs
 
     # if not in TEST mode, then only queue un-processed items