Changeset 37066 for branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/odm.py

Timestamp:

Jul 17, 2014, 12:30:45 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) into trunk

Location:

branches/eam_branches/ipp-ops-20130712/ippToPsps

Files:

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

branches/eam_branches/ipp-ops-20130712/ippToPsps/jython/odm.py

@@ -31 +31 @@
 
         tempFile = tempfile.NamedTemporaryFile(mode='w+b')
-
+        self.logger.infoPair("checkOdmStatus.pl -b " + batch + " -f " + tempFile.name, "")
         p = Popen("checkOdmStatus.pl -b " + batch + " -f " + tempFile.name, 
                 shell=True, 
@@ -78 +78 @@
                 DETAILS = doc.find("{%s}OdmBatchState/{%s}Details" % (NAMESPACE, NAMESPACE)).text
                 results['DETAILS'] = DETAILS
-            elif re.search("processing", STATE): 
+            elif re.search("processing", STATE):
                 loadedToODM = 1
             if re.search("MergeWorthy", MESSAGE): 
@@ -87 +87 @@
                 mergeWorthy = 1
                 merged = 1
+#            if re.search("released", STATE):
+#                loadedToODM = 1
+#                mergeWorthy = 1
+#                merged = 1
+#            if re.search("released", MESSAGE):
+#                loadedToODM = 1
+#                mergeWorthy = 1
+#                merged = 1
         except:
             pass