removed not needed imports

dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/country/SparkFindResultWithCountry.java

@@ -6,8 +6,6 @@ import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
 import java.io.Serializable;
 import java.util.*;
 
-import javax.rmi.CORBA.Util;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.spark.SparkConf;
 import org.apache.spark.api.java.function.FilterFunction;
@@ -19,24 +17,8 @@ import org.apache.spark.sql.SparkSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.jayway.jsonpath.DocumentContext;
-import com.jayway.jsonpath.JsonPath;
-
 import eu.dnetlib.dhp.application.ArgumentApplicationParser;
-import eu.dnetlib.dhp.oa.graph.dump.Constants;
-import eu.dnetlib.dhp.oa.graph.dump.ResultMapper;
 import eu.dnetlib.dhp.oa.graph.dump.Utils;
-import eu.dnetlib.dhp.oa.graph.dump.subset.MasterDuplicate;
-import eu.dnetlib.dhp.oa.graph.dump.subset.SparkDumpResult;
-import eu.dnetlib.dhp.oa.graph.dump.subset.criteria.VerbResolver;
-import eu.dnetlib.dhp.oa.graph.dump.subset.criteria.VerbResolverFactory;
-import eu.dnetlib.dhp.oa.graph.dump.subset.selectionconstraints.Param;
-import eu.dnetlib.dhp.oa.graph.dump.subset.selectionconstraints.SelectionConstraints;
-import eu.dnetlib.dhp.oa.model.graph.GraphResult;
-import eu.dnetlib.dhp.schema.oaf.DataInfo;
-import eu.dnetlib.dhp.schema.oaf.KeyValue;
 import scala.Tuple2;
 
 /**

dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/funderresults/SparkDumpFunderResults.java

@@ -98,10 +98,13 @@ public class SparkDumpFunderResults implements Serializable {
 		if (ofunder.isPresent()) {
 			String fName = ofunder.get().getShortName();
 			if (StringUtil.isNullOrEmpty(fName))
-				return ofunder.get().getName();
+				if (p.getId().indexOf("_") < 0)
-			if (fName.equalsIgnoreCase("ec")) {
+					return p.getId().substring(0, p.getId().indexOf(":"));
+				else
+					return p.getId().substring(0, p.getId().indexOf("_"));
+			// ofunder.get().getName();
+			if (fName.equalsIgnoreCase("ec"))
 				fName += "_" + ofunder.get().getFundingStream();
-			}
 			return fName;
 		} else {
 			String fName = p.getId().substring(0, p.getId().indexOf("_")).toUpperCase();

dump/src/main/java/eu/dnetlib/dhp/oa/graph/dump/subset/SparkSelectSubset.java

@@ -82,7 +82,8 @@ public class SparkSelectSubset implements Serializable {
 			.readPath(spark, inputPath + "/relation", Relation.class)
 			.filter(
 				(FilterFunction<Relation>) r -> !r.getDataInfo().getDeletedbyinference()
-					&& !removeSet.contains(r.getRelClass()));
+					&& !removeSet.contains(r.getRelClass()) &&
+					!r.getRelType().equals("resultService"));
 
 		Dataset<String> resultIds = Utils
 			.readPath(spark, outputPath + "/original/publication", Publication.class)

dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/projectsubset/oozie_app/workflow.xml

@@ -24,18 +24,10 @@
             <name>metadata</name>
             <description> the metadata associated to the deposition</description>
         </property>
-        <property>
-            <name>depositionType</name>
-            <description>the type of deposition we want to perform. "new" for brand new deposition, "version" for a new version of a published deposition (in this case the concept record id must be provided), "upload" to upload content to an open deposition for which we already have the deposition id (in this case the deposition id should be provided)</description>
-        </property>
         <property>
             <name>conceptRecordId</name>
             <description>for new version, the id of the record for the old deposition</description>
         </property>
-        <property>
-            <name>depositionId</name>
-            <description>the depositionId of a deposition open that has to be added content</description>
-        </property>
         <property>
             <name>sparkDriverMemory</name>
             <description>memory for driver process</description>

dump/src/main/resources/eu/dnetlib/dhp/oa/graph/dump/wf/main/oozie_app/workflow.xml

@@ -141,6 +141,7 @@
     <decision name="only_upload">
         <switch>
             <case to="send_zenodo">${wf:conf('onlyUpload') eq true}</case>
+            <case to="make_archive">${wf:conf('makeArchive') eq true}</case>
             <default to="reset_outputpath"/>
         </switch>
     </decision>