From 9ebcdc60bfe0aaca7afbd319b10343e000937546 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Fri, 4 Aug 2023 17:23:50 +0200
Subject: [PATCH] moved parameter file. moved dump out of working dir not to
 have to build it from scratch in case of errors in making the tar

---
 .../dhp/oa/graph/dump/eosc/oozie_app/workflow.xml  | 14 +++++++-------
 .../graph/dump}/eosc_input_maketar_parameters.json |  0
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename dump/src/main/resources/eu/dnetlib/dhp/{common => oa/graph/dump}/eosc_input_maketar_parameters.json (100%)

diff --git a/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/eosc/oozie_app/workflow.xml b/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/eosc/oozie_app/workflow.xml
index 4c9a673..1c83b28 100644
--- a/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/eosc/oozie_app/workflow.xml
+++ b/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/eosc/oozie_app/workflow.xml
@@ -598,7 +598,7 @@
             </spark-opts>
             <arg>--relationPath</arg><arg>${workingDir}/dump/relation</arg>
             <arg>--resultPath</arg><arg>${workingDir}/dump/publicationextendedproject</arg>
-            <arg>--outputPath</arg><arg>${workingDir}/tar/publication</arg>
+            <arg>--outputPath</arg><arg>${outputPath}/dump/publication</arg>
         </spark>
         <ok to="join_extend_relation"/>
         <error to="Kill"/>
@@ -623,7 +623,7 @@
             </spark-opts>
             <arg>--relationPath</arg><arg>${workingDir}/dump/relation</arg>
             <arg>--resultPath</arg><arg>${workingDir}/dump/datasetextendedproject</arg>
-            <arg>--outputPath</arg><arg>${workingDir}/tar/dataset</arg>
+            <arg>--outputPath</arg><arg>${outputPath}/dump/dataset</arg>
         </spark>
         <ok to="join_extend_relation"/>
         <error to="Kill"/>
@@ -648,7 +648,7 @@
             </spark-opts>
             <arg>--relationPath</arg><arg>${workingDir}/dump/relation</arg>
             <arg>--resultPath</arg><arg>${workingDir}/dump/softwareextendedproject</arg>
-            <arg>--outputPath</arg><arg>${workingDir}/tar/software</arg>
+            <arg>--outputPath</arg><arg>${outputPath}/dump/software</arg>
         </spark>
         <ok to="join_extend_relation"/>
         <error to="Kill"/>
@@ -673,7 +673,7 @@
             </spark-opts>
             <arg>--relationPath</arg><arg>${workingDir}/dump/relation</arg>
             <arg>--resultPath</arg><arg>${workingDir}/dump/otherresearchproductextendedproject</arg>
-            <arg>--outputPath</arg><arg>${workingDir}/tar/otherresearchproduct</arg>
+            <arg>--outputPath</arg><arg>${outputPath}/dump/otherresearchproduct</arg>
         </spark>
         <ok to="join_extend_relation"/>
         <error to="Kill"/>
@@ -684,9 +684,9 @@
     <action name="make_archive">
         <java>
             <main-class>eu.dnetlib.dhp.oa.graph.dump.MakeTar</main-class>
-            <arg>--hdfsPath</arg><arg>${outputPath}</arg>
+            <arg>--hdfsPath</arg><arg>${outputPath}/tar</arg>
             <arg>--nameNode</arg><arg>${nameNode}</arg>
-            <arg>--sourcePath</arg><arg>${workingDir}/tar</arg>
+            <arg>--sourcePath</arg><arg>${outputPath}/dump</arg>
         </java>
         <ok to="send_zenodo"/>
         <error to="Kill"/>
@@ -695,7 +695,7 @@
     <action name="send_zenodo">
         <java>
             <main-class>eu.dnetlib.dhp.oa.graph.dump.SendToZenodoHDFS</main-class>
-            <arg>--hdfsPath</arg><arg>${outputPath}</arg>
+            <arg>--hdfsPath</arg><arg>${outputPath}/tar</arg>
             <arg>--nameNode</arg><arg>${nameNode}</arg>
             <arg>--accessToken</arg><arg>${accessToken}</arg>
             <arg>--connectionUrl</arg><arg>${connectionUrl}</arg>
diff --git a/dump/src/main/resources/eu/dnetlib/dhp/common/eosc_input_maketar_parameters.json b/dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/eosc_input_maketar_parameters.json
similarity index 100%
rename from dump/src/main/resources/eu/dnetlib/dhp/common/eosc_input_maketar_parameters.json
rename to dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/eosc_input_maketar_parameters.json