diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json index af52c4e5b..7f44ba03c 100644 --- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json +++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/input_projecttoresult_parameters.json @@ -5,17 +5,11 @@ "paramDescription": "the hive metastore uris", "paramRequired": true }, - { - "paramName":"wu", - "paramLongName":"writeUpdate", - "paramDescription": "true if the update must be writte. No double check if information is already present", - "paramRequired": true - }, { "paramName":"sg", "paramLongName":"saveGraph", "paramDescription": "true if the new version of the graph must be saved", - "paramRequired": true + "paramRequired": false }, { "paramName":"pu", diff --git a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml index 011ff70e3..e4f791dbc 100644 --- a/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml +++ b/dhp-workflows/dhp-propagation/src/main/resources/eu/dnetlib/dhp/projecttoresult/oozie_app/workflow.xml @@ -20,10 +20,6 @@ sparkExecutorCores number of cores used by single executor - - writeUpdate - writes the information found for the update. No double check done if the information is already present - saveGraph writes new version of the graph after the propagation step @@ -31,13 +27,19 @@ + Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}] - + + + + + + @@ -55,7 +57,7 @@ ${jobTracker} ${nameNode} ${nameNode}/${sourcePath}/relation - ${nameNode}/${workingDir}/projecttoresult_propagation/relation + ${nameNode}/${workingDir}/relation @@ -66,7 +68,7 @@ ${jobTracker} ${nameNode} ${nameNode}/${sourcePath}/publication - ${nameNode}/${workingDir}/projecttoresult_propagation/publication + ${nameNode}/${workingDir}/publication @@ -77,7 +79,7 @@ ${jobTracker} ${nameNode} ${nameNode}/${sourcePath}/dataset - ${nameNode}/${workingDir}/projecttoresult_propagation/dataset + ${nameNode}/${workingDir}/dataset @@ -88,7 +90,7 @@ ${jobTracker} ${nameNode} ${nameNode}/${sourcePath}/otherresearchproduct - ${nameNode}/${workingDir}/projecttoresult_propagation/otherresearchproduct + ${nameNode}/${workingDir}/otherresearchproduct @@ -99,7 +101,7 @@ ${jobTracker} ${nameNode} ${nameNode}/${sourcePath}/software - ${nameNode}/${workingDir}/projecttoresult_propagation/software + ${nameNode}/${workingDir}/software @@ -127,8 +129,8 @@ --sourcePath${sourcePath}/relation --allowedsemrels${allowedsemrels} --hive_metastore_uris${hive_metastore_uris} - --potentialUpdatePath${workingDir}/projecttoresult_propagation/preparedInfo/potentialUpdates - --alreadyLinkedPath${workingDir}/projecttoresult_propagation/preparedInfo/alreadyLinked + --potentialUpdatePath${workingDir}/preparedInfo/potentialUpdates + --alreadyLinkedPath${workingDir}/preparedInfo/alreadyLinked @@ -152,13 +154,11 @@ --conf spark.dynamicAllocation.enabled=true --conf spark.dynamicAllocation.maxExecutors=${spark2MaxExecutors} - - --writeUpdate${writeUpdate} --saveGraph${saveGraph} --hive_metastore_uris${hive_metastore_uris} - --outputPath${workingDir}/projecttoresult_propagation/relation - --potentialUpdatePath${workingDir}/projecttoresult_propagation/preparedInfo/potentialUpdates - --alreadyLinkedPath${workingDir}/projecttoresult_propagation/preparedInfo/alreadyLinked + --outputPath${workingDir}/relation + --potentialUpdatePath${workingDir}/preparedInfo/potentialUpdates + --alreadyLinkedPath${workingDir}/preparedInfo/alreadyLinked