[DOIBoost] minor fixes in workflow definition

dhp-workflows/dhp-doiboost/src/main/resources/eu/dnetlib/dhp/doiboost/oozie_app/workflow.xml

@@ -91,9 +91,9 @@
         <switch>
             <case to="ConvertCrossrefToOAF">${wf:conf('resumeFrom') eq 'ConvertCrossrefToOAF'}</case>
             <case to="ResetMagWorkingPath">${wf:conf('resumeFrom') eq 'ResetMagWorkingPath'}</case>
-            <case to="PreprocessMag">${wf:conf('resumeFrom') eq 'PreprocessMag'}</case>
-            <case to="PreprocessUW">${wf:conf('resumeFrom') eq 'PreprocessUW'}</case>
-            <case to="PreprocessORCID">${wf:conf('resumeFrom') eq 'PreprocessORCID'}</case>
+            <case to="ProcessMAG">${wf:conf('resumeFrom') eq 'PreprocessMag'}</case>
+            <case to="ProcessUW">${wf:conf('resumeFrom') eq 'PreprocessUW'}</case>
+            <case to="ProcessORCID">${wf:conf('resumeFrom') eq 'PreprocessORCID'}</case>
             <case to="CreateDOIBoost">${wf:conf('resumeFrom') eq 'CreateDOIBoost'}</case>
             <case to="GenerateActionSet">${wf:conf('resumeFrom') eq 'GenerateActionSet'}</case>
             <default to="ImportCrossRef"/>
@@ -227,13 +227,13 @@
             <arg>--targetPath</arg><arg>${workingPath}</arg>
             <arg>--master</arg><arg>yarn-cluster</arg>
         </spark>
-        <ok to="PreprocessUW"/>
+        <ok to="ProcessUW"/>
         <error to="Kill"/>
     </action>
 
     <!--  UnpayWall  SECTION -->
 
-    <action name="PreprocessUW">
+    <action name="ProcessUW">
         <spark xmlns="uri:oozie:spark-action:0.2">
             <master>yarn-cluster</master>
             <mode>cluster</mode>
@@ -251,12 +251,12 @@
             <arg>--targetPath</arg><arg>${workingPath}</arg>
             <arg>--master</arg><arg>yarn-cluster</arg>
         </spark>
-        <ok to="PreprocessORCID"/>
+        <ok to="ProcessORCID"/>
         <error to="Kill"/>
     </action>
 
     <!--  ORCID  SECTION -->
-    <action name="PreprocessORCID">
+    <action name="ProcessORCID">
         <spark xmlns="uri:oozie:spark-action:0.2">
             <master>yarn-cluster</master>
             <mode>cluster</mode>
@@ -287,7 +287,7 @@
             <class>eu.dnetlib.doiboost.SparkGenerateDoiBoost</class>
             <jar>dhp-doiboost-${projectVersion}.jar</jar>
             <spark-opts>
-                --executor-memory=${sparkExecutorMemory}
+                --executor-memory=${sparkExecutorIntersectionMemory}
                 --executor-cores=${sparkExecutorCores}
                 --driver-memory=${sparkDriverMemory}
                 --conf spark.sql.shuffle.partitions=3840
@@ -312,7 +312,7 @@
             <class>eu.dnetlib.doiboost.SparkGenerateDOIBoostActionSet</class>
             <jar>dhp-doiboost-${projectVersion}.jar</jar>
             <spark-opts>
-                --executor-memory=${sparkExecutorIntersectionMemory}
+                --executor-memory=${sparkExecutorMemory}
                 --executor-cores=${sparkExecutorCores}
                 --driver-memory=${sparkDriverMemory}
                 --conf spark.sql.shuffle.partitions=3840