Changeset 32630 for branches/eam_branches/ipp-20110906/ippToPsps/jython/odm.py

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippToPsps/jython/odm.py (modified) (2 diffs)

branches/eam_branches/ipp-20110906/ippToPsps/jython/odm.py

@@ -45 +45 @@
 
         tempFile.close()
+        p.stdout.close()
 
         if not ret: self.logger.debugPair("Cannot read ODM file for batch", "%d" % batchID)
@@ -67 +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