Changeset 32540 for trunk/ippToPsps

Timestamp:

Oct 13, 2011, 9:48:23 AM (15 years ago)

Author:

rhenders

Message:

now assuming that 'OnHold' batches have failed

File:

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

trunk/ippToPsps/jython/odm.py

@@ -68 +68 @@
             MESSAGE = doc.find("{%s}OdmBatchState/{%s}Message" % (NAMESPACE, NAMESPACE)).text
 
-            if re.search("failed", STATE):
+            # we assume that batches 'OnHold' are failed as it is very rare for such
+            # batches to have there state changed
+            if re.search("failed", STATE) or re.search("OnHold", MESSAGE):
+                loadedToODM = 1
                 loadFailed = 1
                 DETAILS = doc.find("{%s}OdmBatchState/{%s}Details" % (NAMESPACE, NAMESPACE)).text
                 results['DETAILS'] = DETAILS
-            if re.search("MergeWorthy", MESSAGE): mergeWorthy = 1
-            if re.search("Merge[1-9]Completed", MESSAGE): merged = 1
-            if merged: mergeWorthy = 1
-            if mergeWorthy or merged or loadFailed: loadedToODM = 1
+            if re.search("processing", STATE): 
+                loadedToODM = 1
+            if re.search("MergeWorthy", MESSAGE): 
+                loadedToODM = 1
+                mergeWorthy = 1
+            if re.search("Merge[1-9]Completed", MESSAGE): 
+                loadedToODM = 1
+                mergeWorthy = 1
+                merged = 1
         except:
             return 0