From e2ceefe9beae7b9a21803a7831c41cac680273da Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Mon, 14 Sep 2020 14:33:28 +0200
Subject: [PATCH] -

---
 .../oa/graph/dump_whole/input_organization_parameters.json  | 6 ++++++
 .../dnetlib/dhp/oa/graph/dump_whole/oozie_app/workflow.xml  | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/input_organization_parameters.json b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/input_organization_parameters.json
index 3a4632af9..c27a9234d 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/input_organization_parameters.json
+++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/input_organization_parameters.json
@@ -23,6 +23,12 @@
 		"paramLongName": "isSparkSessionManaged",
 		"paramDescription": "true if the spark session is managed, false otherwise",
 		"paramRequired": false
+	},
+	{
+		"paramName":"cmp",
+		"paramLongName":"communityMapPath",
+		"paramDescription": "the path to the serialization of the community map",
+		"paramRequired": true
 	}
 ]
 
diff --git a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/oozie_app/workflow.xml b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/oozie_app/workflow.xml
index a9f6112b1..9eb744389 100644
--- a/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-graph-mapper/src/main/resources/eu/dnetlib/dhp/oa/graph/dump_whole/oozie_app/workflow.xml
@@ -406,6 +406,7 @@
             <arg>--sourcePath</arg><arg>${sourcePath}/relation</arg>
             <arg>--outputPath</arg><arg>${workingDir}/relation/contextOrg</arg>
             <arg>--organizationCommunityMap</arg><arg>${organizationCommunityMap}</arg>
+            <arg>--communityMapPath</arg><arg>${workingDir}/communityMap</arg>
         </spark>
         <ok to="join_context"/>
         <error to="Kill"/>
@@ -547,6 +548,7 @@
             </spark-opts>
             <arg>--sourcePath</arg><arg>${workingDir}</arg>
             <arg>--outputPath</arg><arg>${workingDir}/collect</arg>
+            <arg>--resultAggregation</arg><arg>${resultAggregation}</arg>
         </spark>
         <ok to="make_archive"/>
         <error to="Kill"/>
@@ -558,9 +560,8 @@
             <arg>--hdfsPath</arg><arg>${outputPath}</arg>
             <arg>--nameNode</arg><arg>${nameNode}</arg>
             <arg>--sourcePath</arg><arg>${workingDir}/collect</arg>
-            <arg>--resultAggregation</arg><arg>${resultAggregation}</arg>
         </java>
-        <ok to="send_zenodo"/>
+        <ok to="End"/>
         <error to="Kill"/>
     </action>