Changeset 33638 for branches/eam_branches/ipp-20111122/ippToPsps/jython/odm.py

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippToPsps/jython/odm.py (modified) (7 diffs)

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

@@ -2 +2 @@
 
 import re
+import os
+import signal
 import sys
 import tempfile
@@ -17 +19 @@
     Constructor
     '''
-    def __init__(self, logger, doc):
+    def __init__(self, logger):
 
         self.logger = logger
-        self.doc = doc
 
     '''
@@ -33 +34 @@
         p = Popen("../perl/checkOdmStatus.pl -b " + batch + " -f " + tempFile.name, 
                 shell=True, 
-                stdout=PIPE)
+                stdout=PIPE,
+                close_fds=True)
         p.wait()
-        
+       
         if p.returncode != 0:
            self.logger.debugPair("ODM polling", "failed")
@@ -46 +48 @@
         tempFile.close()
         p.stdout.close()
+
 
         if not ret: self.logger.debugPair("Cannot read ODM file for batch", "%d" % batchID)
@@ -59 +62 @@
 
         loadedToODM = 0
-        loadFailed = 0
         mergeWorthy = 0
         merged = 0
@@ -73 +75 @@
             # 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
@@ -87 +88 @@
                 merged = 1
         except:
-            return 0
+            pass
 
         results['LOADEDTOODM'] = loadedToODM
-        results['LOADFAILED'] = loadFailed
         results['MERGEWORTHY'] = mergeWorthy
         results['MERGED'] = merged