RCE scripting - update - added xpaths and dataschema to XML Loader element

Former-commit-id: 92f768637e30dd4bbf7f444201ee943077e47790

pyKADMOS/sample/graph.py

@@ -24,7 +24,7 @@ import networkx as nx
 import matplotlib.pyplot as plt
 from pyKADMOS.packages.TIXI_2_2_4.additional_tixi_functions import addOrUpdateDoubleElement, addOrUpdateIntegerElement,\
-    writeNodesToCMDOWS, get_element_details, ensureElementUXPath
+    writeNodesToCMDOWS, get_element_details, ensureElementUXPath, get_xpath_from_uxpath
 from pyKADMOS.packages.TIXI_2_2_4.tixiwrapper import Tixi
 from pyKADMOS.packages.XDSM_writer.XDSM import XDSM
 from pyKADMOS.sample.XMLutilities import build_xpath, get_element_dict, merge
@@ -8343,22 +8343,25 @@ class RceGraph(KadmosGraph):
                 dataschema = tixi.exportDocumentAsString()
                 print 'CHECK DATASCHEMA'
                 print dataschema
-                tixi.close()
                 metadata_dict = {'data_schema':dataschema}
                 # Add XML Loader
                 rce_wf.add_rce_node(rce_role=rce_role, node_name=node['label'],
                                     location=(32 + pos * 100, 30 + pos * 100),
                                     metadata=metadata_dict)
-                for xpath in node['xpaths']:
+                for uxpath in node['xpaths']:
+                    xpath = get_xpath_from_uxpath(tixi, uxpath)
+                    print uxpath
+                    print xpath
                     rce_wf.add_dynamic_input(node_idx=pos,
-                                             name=self.get_var_name(xpath),
+                                             name=self.get_var_name(uxpath),
                                              group="null",
                                              datatype="Float",
                                              metadata=OrdDict((
                                                               ("inputExecutionConstraint_4aae3eea", "Required"),
                                                               ("inputHandling_73b1056e", "Single"),
                                                               ("variable.xpath", xpath))))
+                tixi.close()
             elif rce_role == self.RCE_ROLES_FUNS[3]:  # XML PyMerger
                 assert node['number_of_xmls'] < 11, \
                     'The ' + str(node['label']) + '  XML PyMerger needs to merge more than 10 XML files.'