From 19746ad308e358cd4e8429b326de684addcc1d13 Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Tue, 17 Mar 2020 17:17:06 +0100
Subject: [PATCH] when reuseContent, reset ${workingPath}/all_entities

---
 .../regular_all_steps/oozie_app/workflow.xml  | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/migration/wfs/regular_all_steps/oozie_app/workflow.xml b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/migration/wfs/regular_all_steps/oozie_app/workflow.xml
index e990cdbad..a68e74d23 100644
--- a/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/migration/wfs/regular_all_steps/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/migration/wfs/regular_all_steps/oozie_app/workflow.xml
@@ -48,25 +48,16 @@
         </property>
     </parameters>
 
-	<start to="ResetGraphPath"/>
+	<start to="ReuseContent"/>
 
     <kill name="Kill">
         <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
     </kill>
 
-    <action name="ResetGraphPath">
-        <fs>
-            <delete path="'${graphBasePath}/graph_raw'"/>
-            <mkdir path="'${graphBasePath}/graph_raw'"/>
-        </fs>
-        <ok to="ReuseContent"/>
-        <error to="Kill"/>
-    </action>
-
     <decision name="ReuseContent">
         <switch>
             <case to="ResetWorkingPath">${wf:conf('reuseContent') eq false}</case>
-            <case to="GenerateEntities">${wf:conf('reuseContent') eq true}</case>
+            <case to="ResetAllEntitiesPath">${wf:conf('reuseContent') eq true}</case>
             <default to="ResetWorkingPath"/>
         </switch>
     </decision>
@@ -122,6 +113,15 @@
             <arg>-l</arg><arg>store</arg>
             <arg>-i</arg><arg>cleaned</arg>
         </java>
+        <ok to="ResetAllEntitiesPath"/>
+        <error to="Kill"/>
+    </action>
+
+    <action name="ResetAllEntitiesPath">
+        <fs>
+            <delete path="'${workingPath}/all_entities'"/>
+            <mkdir path="'${workingPath}/all_entities'"/>
+        </fs>
         <ok to="GenerateEntities"/>
         <error to="Kill"/>
     </action>
@@ -150,6 +150,15 @@
             <arg>-pguser</arg><arg>${postgresUser}</arg>
             <arg>-pgpasswd</arg><arg>${postgresPassword}</arg>
         </spark>
+        <ok to="ResetGraphPath"/>
+        <error to="Kill"/>
+    </action>
+
+    <action name="ResetGraphPath">
+        <fs>
+            <delete path="'${graphBasePath}/graph_raw'"/>
+            <mkdir path="'${graphBasePath}/graph_raw'"/>
+        </fs>
         <ok to="GenerateGraph"/>
         <error to="Kill"/>
     </action>