From e7e418e444cab97084faa167c0fe3057b09a9de0 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Wed, 25 Nov 2020 13:44:10 +0100
Subject: [PATCH] added decision node to verify if to upload in Zenodo

---
 .../dump/funderresults/oozie_app/workflow.xml | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/funderresults/oozie_app/workflow.xml b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/funderresults/oozie_app/workflow.xml
index d258d4dd4..d310390b7 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/funderresults/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/funderresults/oozie_app/workflow.xml
@@ -1,6 +1,11 @@
 <workflow-app name="dump_funder_results" xmlns="uri:oozie:workflow:0.5">
 
     <parameters>
+        <property>
+            <name>upload</name>
+            <value>false</value>
+            <description>true to upload the dump for the funders in Zenodo</description>
+        </property>
         <property>
             <name>sourcePath</name>
             <description>the source path</description>
@@ -116,7 +121,7 @@
             <delete path="${outputPath}"/>
             <mkdir path="${outputPath}"/>
         </fs>
-        <ok to="save_community_map"/>
+        <ok to="make_archive"/>
         <error to="Kill"/>
     </action>
 
@@ -515,12 +520,31 @@
                 --conf spark.sql.warehouse.dir=${sparkSqlWarehouseDir}
             </spark-opts>
             <arg>--sourcePath</arg><arg>${workingDir}/ext</arg>
-            <arg>--outputPath</arg><arg>${outputPath}</arg>
+            <arg>--outputPath</arg><arg>${workingDir}/resultperfunder</arg>
             <arg>--relationPath</arg><arg>${sourcePath}</arg>
         </spark>
-        <ok to="End"/>
+        <ok to="make_archive"/>
         <error to="Kill"/>
     </action>
+
+    <action name="make_archive">
+        <java>
+            <main-class>eu.dnetlib.dhp.oa.graph.dump.MakeTar</main-class>
+            <arg>--hdfsPath</arg><arg>${outputPath}</arg>
+            <arg>--nameNode</arg><arg>${nameNode}</arg>
+<!--            <arg>&#45;&#45;sourcePath</arg><arg>${workingDir}/resultperfunder</arg>-->
+            <arg>--sourcePath</arg><arg>/user/miriam.baglioni/graph_dump_whole_production_funder_results</arg>
+        </java>
+        <ok to="should_upload"/>
+        <error to="Kill"/>
+    </action>
+
+    <decision name="should_upload">
+        <switch>
+            <case to="send_zenodo">${wf:conf('upload') eq true}</case>
+            <default to="End"/>
+        </switch>
+    </decision>
     
     <action name="send_zenodo">
         <java>