From d012aec0b34369d5ec1074815b05785880329c7c Mon Sep 17 00:00:00 2001
From: Giambattista Bloisi <gbloisi@gmail.com>
Date: Mon, 28 Aug 2023 22:44:54 +0200
Subject: [PATCH 1/2] Revert PropagateRelation's argument name from outputPath
 to graphOutputPath in consistency workflow (#8964)

---
 .../eu/dnetlib/dhp/oa/dedup/consistency/oozie_app/workflow.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/oa/dedup/consistency/oozie_app/workflow.xml b/dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/oa/dedup/consistency/oozie_app/workflow.xml
index eb7e6d98d..2302d4b8f 100644
--- a/dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/oa/dedup/consistency/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-dedup-openaire/src/main/resources/eu/dnetlib/dhp/oa/dedup/consistency/oozie_app/workflow.xml
@@ -95,7 +95,7 @@
                 --conf spark.sql.shuffle.partitions=15000
             </spark-opts>
             <arg>--graphBasePath</arg><arg>${graphBasePath}</arg>
-            <arg>--outputPath</arg><arg>${workingPath}/propagaterelation/</arg>
+            <arg>--graphOutputPath</arg><arg>${workingPath}/propagaterelation/</arg>
             <arg>--workingPath</arg><arg>${workingPath}</arg>
         </spark>
         <ok to="CleanRelation"/>

From f437be80ad851bf4f67bfde629798603979b1216 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Tue, 29 Aug 2023 09:03:03 +0200
Subject: [PATCH 2/2] [impact indicators] adjusted paths in the bip ranker wf
 parameters

---
 .../impact_indicators/oozie_app/workflow.xml  | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml b/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml
index c225fa3e1..0d7d29bfe 100644
--- a/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-impact-indicators/src/main/resources/eu/dnetlib/dhp/oa/graph/impact_indicators/oozie_app/workflow.xml
@@ -9,6 +9,26 @@
 				<name>oozie.action.sharelib.for.spark</name>
 				<value>${oozieActionShareLibForSpark2}</value>
 			</property>
+			<property>
+				<name>projectImpactIndicatorsOutput</name>
+				<value>${nameNode}${workingDir}/project_indicators</value>
+			</property>
+			<property>
+				<name>openaireGraphInputPath</name>
+				<value>${nameNode}/${workingDir}/openaire_id_graph</value>
+			</property>
+			<property>
+				<name>synonymFolder</name>
+				<value>${nameNode}/${workingDir}/openaireid_to_dois/</value>
+			</property>
+			<property>
+				<name>checkpointDir</name>
+				<value>${nameNode}/${workingDir}/check/</value>
+			</property>
+			<property>
+				<name>bipScorePath</name>
+				<value>${nameNode}${workingDir}/openaire_universe_scores/</value>
+			</property>
 		</configuration>
 	</global>
 
@@ -65,9 +85,8 @@
 			<!-- number of partitions to be used on joins -->
 			<arg>${sparkShufflePartitions}</arg>
 			<!-- The output of the graph should be the openaire input graph for ranking-->
-			<arg>${openaireGraphInputPath}</arg>
-
-			<file>${wfAppPath}/create_openaire_ranking_graph.py#create_openaire_ranking_graph.py</file>
+			<arg>${nameNode}${workingDir}/openaire_id_graph</arg>
+			<file>${nameNode}${wfAppPath}/create_openaire_ranking_graph.py#create_openaire_ranking_graph.py</file>
 		</spark>
 
 		<ok to="non-iterative-rankings" />
@@ -103,7 +122,7 @@
 			</spark-opts>
 
 			<!-- Script arguments here -->
-			<arg>${openaireGraphInputPath}</arg>
+			<arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
 			<!-- number of partitions to be used on joins -->
 			<arg>${sparkShufflePartitions}</arg>
 
@@ -136,7 +155,7 @@
 			</spark-opts>
 
 			<!-- Script arguments here -->
-			<arg>${openaireGraphInputPath}</arg>
+			<arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
 			<arg>${ramGamma}</arg>
 			<arg>${currentYear}</arg>
 			<arg>RAM</arg>
@@ -174,7 +193,7 @@
 			</spark-opts>
 
 			<!-- Script arguments here -->
-			<arg>${openaireGraphInputPath}</arg>
+			<arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
 			<!-- number of partitions to be used on joins -->
 			<arg>${sparkShufflePartitions}</arg>
 			<arg>3</arg>
@@ -207,7 +226,7 @@
 			</spark-opts>
 
 			<!-- Script arguments here -->
-			<arg>${openaireGraphInputPath}</arg>
+			<arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
 			<arg>${pageRankAlpha}</arg>
 			<arg>${convergenceError}</arg>
 			<arg>${checkpointDir}</arg>
@@ -243,7 +262,7 @@
 			</spark-opts>
 
 			<!-- Script arguments here -->
-			<arg>${openaireGraphInputPath}</arg>
+			<arg>${nameNode}/${workingDir}/openaire_id_graph</arg>
 			<arg>${attrankAlpha}</arg>
 			<arg>${attrankBeta}</arg>
 			<arg>${attrankGamma}</arg>