From b81e6af429338087dcd2b96cf4d458cde69ccc24 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Tue, 18 Feb 2020 17:30:44 +0100
Subject: [PATCH]  added config for new propagation

---
 ...esulaffiliationfrominstrepo_parameters.json | 12 ------------
 .../oozie_app/workflow.xml                     | 18 ++++--------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/input_propagationresulaffiliationfrominstrepo_parameters.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/input_propagationresulaffiliationfrominstrepo_parameters.json
index 090f3f1520..2aa5332b22 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/input_propagationresulaffiliationfrominstrepo_parameters.json
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/input_propagationresulaffiliationfrominstrepo_parameters.json
@@ -10,17 +10,5 @@
     "paramLongName":"sourcePath",
     "paramDescription": "the path of the sequencial file to read",
     "paramRequired": true
-  },
-  {
-    "paramName":"wl",
-    "paramLongName":"whitelist",
-    "paramDescription": "datasource id that will be considered even if not in the allowed typology list. Split by ;",
-    "paramRequired": true
-  },
-  {
-    "paramName":"at",
-    "paramLongName":"allowedtypes",
-    "paramDescription": "the types of the allowed datasources. Split by ;",
-    "paramRequired": true
   }
 ]
\ No newline at end of file
diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml
index f24417bc05..ed634b37d9 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/resulttoorganizationfrominstrepo/oozie_app/workflow.xml
@@ -1,17 +1,9 @@
-<workflow-app name="country_propagation" xmlns="uri:oozie:workflow:0.5">
+<workflow-app name="affiliation_from_instrepo_propagation" xmlns="uri:oozie:workflow:0.5">
     <parameters>
         <property>
             <name>sourcePath</name>
             <description>the source path</description>
         </property>
-        <property>
-            <name>whitelist</name>
-            <description>the white list</description>
-        </property>
-        <property>
-            <name>allowedtypes</name>
-            <description>the allowed types</description>
-        </property>
         <property>
             <name>sparkDriverMemory</name>
             <description>memory for driver process</description>
@@ -26,20 +18,20 @@
         </property>
     </parameters>
 
-    <start to="CountryPropagation"/>
+    <start to="AffiliationPropagation"/>
 
     <kill name="Kill">
         <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
     </kill>
 
-    <action name="CountryPropagation">
+    <action name="AffiliationPropagation">
         <spark xmlns="uri:oozie:spark-action:0.2">
             <job-tracker>${jobTracker}</job-tracker>
             <name-node>${nameNode}</name-node>
             <master>yarn-cluster</master>
             <mode>cluster</mode>
             <name>CountryPropagation</name>
-            <class>eu.dnetlib.dhp.countrypropagation.SparkCountryPropagationJob</class>
+            <class>eu.dnetlib.dhp.resulttoorganizationfrominstrepo.SparkResultToOrganizationFromIstRepoJob</class>
             <jar>dhp-propagation-${projectVersion}.jar</jar>
             <spark-opts>--executor-memory ${sparkExecutorMemory}
                 --executor-cores ${sparkExecutorCores}
@@ -49,8 +41,6 @@
             </spark-opts>
             <arg>-mt</arg> <arg>yarn-cluster</arg>
             <arg>--sourcePath</arg><arg>${sourcePath}</arg>
-            <arg>--whitelist</arg><arg>${whitelist}</arg>
-            <arg>--allowedtypes</arg><arg>${allowedtypes}</arg>
         </spark>
         <ok to="End"/>
         <error to="Kill"/>