From 627ad58a8b8fa6c53908c3a6e9bceb819a681c23 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 9 Apr 2020 11:33:19 +0200
Subject: [PATCH] new wf definition

---
 .../{Country.java => CountrySbs.java}         |  0
 .../input_countrypropagation_parameters.json  | 12 +++++++
 .../input_prepare_dc_assoc.json               | 32 -------------------
 .../countrypropagation/oozie_app/workflow.xml | 24 ++++++++++++--
 4 files changed, 33 insertions(+), 35 deletions(-)
 rename dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/{Country.java => CountrySbs.java} (100%)
 delete mode 100644 dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepare_dc_assoc.json

diff --git a/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/Country.java b/dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/CountrySbs.java
similarity index 100%
rename from dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/Country.java
rename to dhp-workflows/dhp-propagation/src/main/java/eu/dnetlib/dhp/countrypropagation/CountrySbs.java
diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json
index 068c673ce..829c96420 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_countrypropagation_parameters.json
@@ -34,5 +34,17 @@
     "paramLongName":"resultTableName",
     "paramDescription": "the name of the result table we are currently working on",
     "paramRequired": true
+  },
+  {
+    "paramName": "out",
+    "paramLongName": "outputPath",
+    "paramDescription": "the path used to store temporary output files",
+    "paramRequired": true
+  },
+  {
+    "paramName": "p",
+    "paramLongName": "preparedInfoPath",
+    "paramDescription": "the path where prepared info have been stored",
+    "paramRequired": true
   }
 ]
\ No newline at end of file
diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepare_dc_assoc.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepare_dc_assoc.json
deleted file mode 100644
index ff1b79d9c..000000000
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/input_prepare_dc_assoc.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
-  {
-    "paramName":"mt",
-    "paramLongName":"master",
-    "paramDescription": "should be local or yarn",
-    "paramRequired": true
-  },
-  {
-    "paramName":"s",
-    "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
-  },
-  {
-    "paramName":"h",
-    "paramLongName":"hive_metastore_uris",
-    "paramDescription": "the hive metastore uris",
-    "paramRequired": true
-  }
-]
\ No newline at end of file
diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml
index d91207f46..38aa93335 100644
--- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/countrypropagation/oozie_app/workflow.xml
@@ -36,6 +36,15 @@
             <name>saveGraph</name>
             <description>writes new version of the graph after the propagation step</description>
         </property>
+        <property>
+            <name>outputPath</name>
+            <description>the path used to store temporary output files</description>
+        </property>
+        <property>
+            <name>preparedInfoPath</name>
+            <description>the path where prepared info have been stored</description>
+        </property>
+
     </parameters>
 
     <start to="prepare_datasource_country_association"/>
@@ -65,13 +74,14 @@
             <arg>--whitelist</arg><arg>${whitelist}</arg>
             <arg>--allowedtypes</arg><arg>${allowedtypes}</arg>
             <arg>--hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>
+            <arg>--outputPath</arg><arg>${workingDir}/country_propagation/preparedInfo</arg>
         </spark>
         <ok to="fork_join_apply_country_propagation"/>
         <error to="Kill"/>
     </action>
     <fork name="fork_join_apply_country_propagation">
-        <path start="join_propagation_publication"/>
-        <path start="join_propagation_dataset"/>
+<!--        <path start="join_propagation_publication"/>-->
+<!--        <path start="join_propagation_dataset"/>-->
         <path start="join_propagation_otherresearchproduct"/>
         <path start="join_propagation_software"/>
     </fork>
@@ -98,6 +108,8 @@
             <arg>--writeUpdate</arg><arg>${writeUpdate}</arg>
             <arg>--saveGraph</arg><arg>${saveGraph}</arg>
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Publication</arg>
+            <arg>--outputPath</arg><arg>${workingDir}/country_propagation/publication</arg>
+            <arg>--preparedInfoPath</arg><arg>${workingDir}/country_propagation/preparedInfo</arg>
         </spark>
         <ok to="end"/>
         <error to="Kill"/>
@@ -125,6 +137,8 @@
             <arg>--writeUpdate</arg><arg>${writeUpdate}</arg>
             <arg>--saveGraph</arg><arg>${saveGraph}</arg>
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Dataset</arg>
+            <arg>--outputPath</arg><arg>${workingDir}/country_propagation/publication</arg>
+            <arg>--preparedInfoPath</arg><arg>${workingDir}/country_propagation/preparedInfo</arg>
         </spark>
         <ok to="end"/>
         <error to="Kill"/>
@@ -152,6 +166,8 @@
             <arg>--writeUpdate</arg><arg>${writeUpdate}</arg>
             <arg>--saveGraph</arg><arg>${saveGraph}</arg>
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Otherresearchproduct</arg>
+            <arg>--outputPath</arg><arg>${workingDir}/country_propagation/publication</arg>
+            <arg>--preparedInfoPath</arg><arg>${workingDir}/country_propagation/preparedInfo</arg>
         </spark>
         <ok to="end"/>
         <error to="Kill"/>
@@ -179,11 +195,13 @@
             <arg>--writeUpdate</arg><arg>${writeUpdate}</arg>
             <arg>--saveGraph</arg><arg>${saveGraph}</arg>
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Software</arg>
+            <arg>--outputPath</arg><arg>${workingDir}/country_propagation/publication</arg>
+            <arg>--preparedInfoPath</arg><arg>${workingDir}/country_propagation/preparedInfo</arg>
         </spark>
         <ok to="end"/>
         <error to="Kill"/>
     </action>
-    
+
     <action name="CountryPropagation">
         <spark xmlns="uri:oozie:spark-action:0.2">
             <job-tracker>${jobTracker}</job-tracker>