From f9005a2e87ebd06ad3f4b1abcac06405ea196aa3 Mon Sep 17 00:00:00 2001
From: Enrico Ottonello <enrico.ottonello@isti.cnr.it>
Date: Thu, 19 Sep 2019 15:10:43 +0200
Subject: [PATCH] added mapping url parameter to workflow

---
 .../nodes/applicationContext-ariadneplus-msro-nodes.xml     | 2 ++
 .../ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st | 3 ++-
 .../bootstrap/profiles/workflows/transform_x3m_template.xml | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/nodes/applicationContext-ariadneplus-msro-nodes.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/nodes/applicationContext-ariadneplus-msro-nodes.xml
index cb4cbfe..7adecc6 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/nodes/applicationContext-ariadneplus-msro-nodes.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/nodes/applicationContext-ariadneplus-msro-nodes.xml
@@ -26,5 +26,7 @@
 
 	<bean id="wfNodeReadVirtuoso" class="eu.dnetlib.ariadneplus.workflows.nodes.ReadVirtuosoJobNode" scope="prototype"/>
 	<bean id="wfNodeReadVirtuosoByType" class="eu.dnetlib.ariadneplus.workflows.nodes.ReadVirtuosoByTypeJobNode" scope="prototype"/>
+	
+	<bean id="wfNodeX3MTransformAriadnePlus" class="eu.dnetlib.ariadneplus.workflows.nodes.X3MTransformAriadnePlusJobNode" scope="prototype"/>
 
 </beans>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st
index b6d749b..f1277d7 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/ariadneplus/workflows/repo-hi/x3m_aggregation_wf.xml.st
@@ -32,7 +32,7 @@
 				<PARAM name="indexId"               description="Identifier of the Index"           required="true" managedBy="system"  category="INDEX_ID"/>
             	<PARAM name="indexInterpretation"   description="Index Interpretation"              required="true" managedBy="system"  type="string">transformed</PARAM>
             	<PARAM name="feedingType"           description="Index feeding type"                required="true" managedBy="user"    type="string"   function="validValues(['REFRESH','INCREMENTAL'])">REFRESH</PARAM>
-
+				<PARAM name="mappingUrl"           description="mapping url"                required="true" managedBy="user"    type="string"   ></PARAM>
 			</PARAMETERS>
             <WORKFLOW>
                 <NODE isStart="true" name="collection" type="LaunchWorkflowTemplate">
@@ -73,6 +73,7 @@
                                 <ENTRY key="cleaningRuleId"                 ref="cleaningRuleId"/>
                                 <ENTRY key="transformationMode"             ref="transformationMode" />
                                 <ENTRY key="passFullRecord"                 ref="passFullRecord" />
+                                <ENTRY key="mappingUrl"                 ref="mappingUrl" />
                             </MAP>
                         </PARAM>
                     </PARAMETERS>
diff --git a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/transform_x3m_template.xml b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/transform_x3m_template.xml
index f2ba9a9..2409731 100644
--- a/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/transform_x3m_template.xml
+++ b/dnet-ariadneplus/src/main/resources/eu/dnetlib/bootstrap/profiles/workflows/transform_x3m_template.xml
@@ -19,6 +19,7 @@
 				<PARAM name="passFullRecord" description="True to pass the full record to x3m" required="true" type="boolean" />
 				<PARAM name="verboseTransformationLogging" description="Enable verbose logging of X3M" required="false" type="boolean"/>
 				<PARAM name="cleaningRuleId" description="Cleaning rule" required="true" type="string" />
+				<PARAM name="mappingUrl" description="Mapping url" required="true" type="string" />
 			</PARAMETERS>
 			<WORKFLOW>
 				<NODE name="SELECT_MODE" type="Selection" isStart="true">
@@ -51,7 +52,7 @@
 					</PARAMETERS>
 					<ARCS>
 						<!--<ARC to="validateAgainstSchema"/> -->
-						<ARC to="x3mTransform"/>
+						<ARC to="X3MTransformAriadnePlus"/>
 					</ARCS>
 				</NODE>
 				<!--<NODE name="validateAgainstSchema" type="XMLSchemaValidator">-->
@@ -67,7 +68,7 @@
 						<!--<ARC to="x3mTransform"/>-->
 					<!--</ARCS>-->
 				<!--</NODE>-->
-				<NODE name="x3mTransform" type="X3MTransform">
+				<NODE name="X3MTransformAriadnePlus" type="X3MTransformAriadnePlus">
 					<DESCRIPTION>Transform valid records</DESCRIPTION>
 					<PARAMETERS>
 						<PARAM name="inputEprParam" value="orig_epr"/>
@@ -76,6 +77,7 @@
 						<PARAM name="mappingProfileIds" ref="mappingProfiles"/>
 						<PARAM name="verboseLogging" ref="verboseTransformationLogging"/>
 						<PARAM name="passFullRecord" ref="passFullRecord"/>
+						<PARAM name="mappingUrl" ref="mappingUrl"/>
 					</PARAMETERS>
 					<ARCS>
 						<ARC to="clean"/>