Changeset 33268

Timestamp:

Feb 14, 2012, 4:33:20 PM (14 years ago)

Author:

rhenders

Message:

fixed bug where batch checker returned False for 'OnHold' batches; removed need for LOADFAILED field - now LOADEDTOODM is set to -1

File:

• trunk/ippToPsps/jython/odm.py (modified) (3 diffs)

trunk/ippToPsps/jython/odm.py

@@ -63 +63 @@
 
         loadedToODM = 0
-        loadFailed = 0
         mergeWorthy = 0
         merged = 0
@@ -77 +76 @@
             # batches to have there state changed
             if re.search("failed", STATE) or re.search("OnHold", MESSAGE):
-                loadedToODM = 1
-                loadFailed = 1
+                loadedToODM = -1
                 DETAILS = doc.find("{%s}OdmBatchState/{%s}Details" % (NAMESPACE, NAMESPACE)).text
                 results['DETAILS'] = DETAILS
@@ -91 +89 @@
                 merged = 1
         except:
-            return 0
+            pass
 
         results['LOADEDTOODM'] = loadedToODM
-        results['LOADFAILED'] = loadFailed
         results['MERGEWORTHY'] = mergeWorthy
         results['MERGED'] = merged