Changeset 34041 for branches/meh_branches/ppstack_test/ippToPsps/jython/odm.py

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

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

branches/meh_branches/ppstack_test/ippToPsps/jython/odm.py

@@ -19 +19 @@
     Constructor
     '''
-    def __init__(self, logger, doc):
+    def __init__(self, logger):
 
         self.logger = logger
-        self.doc = doc
 
     '''
@@ -79 +78 @@
                 DETAILS = doc.find("{%s}OdmBatchState/{%s}Details" % (NAMESPACE, NAMESPACE)).text
                 results['DETAILS'] = DETAILS
-            if re.search("processing", STATE): 
+            elif re.search("processing", STATE): 
                 loadedToODM = 1
             if re.search("MergeWorthy", MESSAGE):