report) {
+ sendMessage(new Message(MessageType.REPORT, workflowId, report));
+ }
+
+ private Message createOngoingMessage(final Long current, final Long total) {
+ final Message m = new Message(MessageType.ONGOING, workflowId);
+ m.getBody().put(Message.CURRENT_PARAM, current.toString());
+ if (total != null) {
+ m.getBody().put(Message.TOTAL_PARAM, total.toString());
+ }
+ return m;
+ }
+
+ private void _sendMessage(final Message message) {
+ try {
+ final String json = objectMapper.writeValueAsString(message);
+
+ final HttpPut req = new HttpPut(dnetMessageEndpoint);
+ req.setEntity(new StringEntity(json, ContentType.APPLICATION_JSON));
+
+ final RequestConfig requestConfig = RequestConfig
+ .custom()
+ .setConnectTimeout(CONNTECTION_TIMEOUT_MS)
+ .setConnectionRequestTimeout(CONNECTION_REQUEST_TIMEOUT_MS)
+ .setSocketTimeout(SOCKET_TIMEOUT_MS)
+ .build();
+
+ try (final CloseableHttpClient client = HttpClients
+ .custom()
+ .setDefaultRequestConfig(requestConfig)
+ .build();
+ final CloseableHttpResponse response = client.execute(req)) {
+ log.debug("Sent Message to " + dnetMessageEndpoint);
+ log.debug("MESSAGE:" + message);
+ } catch (final Throwable e) {
+ log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e);
+ }
+ } catch (final JsonProcessingException e) {
+ log.error("Error sending message to " + dnetMessageEndpoint + ", message content: " + message, e);
+ }
+ }
+
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/message/MessageType.java b/dhp-common/src/main/java/eu/dnetlib/dhp/message/MessageType.java
new file mode 100644
index 000000000..75ffb8ef5
--- /dev/null
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/message/MessageType.java
@@ -0,0 +1,21 @@
+
+package eu.dnetlib.dhp.message;
+
+import java.io.Serializable;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+
+public enum MessageType implements Serializable {
+
+ ONGOING, REPORT;
+
+ public MessageType from(String value) {
+ return Optional
+ .ofNullable(value)
+ .map(StringUtils::upperCase)
+ .map(MessageType::valueOf)
+ .orElseThrow(() -> new IllegalArgumentException("unknown message type: " + value));
+ }
+
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/MetadataRecord.java b/dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/MetadataRecord.java
deleted file mode 100644
index ce65e710f..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/MetadataRecord.java
+++ /dev/null
@@ -1,121 +0,0 @@
-
-package eu.dnetlib.dhp.model.mdstore;
-
-import java.io.Serializable;
-
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-/** This class models a record inside the new Metadata store collection on HDFS * */
-public class MetadataRecord implements Serializable {
-
- /** The D-Net Identifier associated to the record */
- private String id;
-
- /** The original Identifier of the record */
- private String originalId;
-
- /** The encoding of the record, should be JSON or XML */
- private String encoding;
-
- /**
- * The information about the provenance of the record see @{@link Provenance} for the model of this information
- */
- private Provenance provenance;
-
- /** The content of the metadata */
- private String body;
-
- /** the date when the record has been stored */
- private long dateOfCollection;
-
- /** the date when the record has been stored */
- private long dateOfTransformation;
-
- public MetadataRecord() {
- this.dateOfCollection = System.currentTimeMillis();
- }
-
- public MetadataRecord(
- String originalId,
- String encoding,
- Provenance provenance,
- String body,
- long dateOfCollection) {
-
- this.originalId = originalId;
- this.encoding = encoding;
- this.provenance = provenance;
- this.body = body;
- this.dateOfCollection = dateOfCollection;
- this.id = DHPUtils.generateIdentifier(originalId, this.provenance.getNsPrefix());
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getOriginalId() {
- return originalId;
- }
-
- public void setOriginalId(String originalId) {
- this.originalId = originalId;
- }
-
- public String getEncoding() {
- return encoding;
- }
-
- public void setEncoding(String encoding) {
- this.encoding = encoding;
- }
-
- public Provenance getProvenance() {
- return provenance;
- }
-
- public void setProvenance(Provenance provenance) {
- this.provenance = provenance;
- }
-
- public String getBody() {
- return body;
- }
-
- public void setBody(String body) {
- this.body = body;
- }
-
- public long getDateOfCollection() {
- return dateOfCollection;
- }
-
- public void setDateOfCollection(long dateOfCollection) {
- this.dateOfCollection = dateOfCollection;
- }
-
- public long getDateOfTransformation() {
- return dateOfTransformation;
- }
-
- public void setDateOfTransformation(long dateOfTransformation) {
- this.dateOfTransformation = dateOfTransformation;
- }
-
- @Override
- public boolean equals(Object o) {
- if (!(o instanceof MetadataRecord)) {
- return false;
- }
- return ((MetadataRecord) o).getId().equalsIgnoreCase(id);
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/Provenance.java b/dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/Provenance.java
deleted file mode 100644
index 556535022..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/model/mdstore/Provenance.java
+++ /dev/null
@@ -1,52 +0,0 @@
-
-package eu.dnetlib.dhp.model.mdstore;
-
-import java.io.Serializable;
-
-/**
- * @author Sandro La Bruzzo
- *
- * Provenace class models the provenance of the record in the metadataStore It contains the identifier and the
- * name of the datasource that gives the record
- */
-public class Provenance implements Serializable {
-
- private String datasourceId;
-
- private String datasourceName;
-
- private String nsPrefix;
-
- public Provenance() {
- }
-
- public Provenance(String datasourceId, String datasourceName, String nsPrefix) {
- this.datasourceId = datasourceId;
- this.datasourceName = datasourceName;
- this.nsPrefix = nsPrefix;
- }
-
- public String getDatasourceId() {
- return datasourceId;
- }
-
- public void setDatasourceId(String datasourceId) {
- this.datasourceId = datasourceId;
- }
-
- public String getDatasourceName() {
- return datasourceName;
- }
-
- public void setDatasourceName(String datasourceName) {
- this.datasourceName = datasourceName;
- }
-
- public String getNsPrefix() {
- return nsPrefix;
- }
-
- public void setNsPrefix(String nsPrefix) {
- this.nsPrefix = nsPrefix;
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/AuthorMerger.java b/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/AuthorMerger.java
index 17482c019..aea046203 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/AuthorMerger.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/AuthorMerger.java
@@ -18,6 +18,9 @@ public class AuthorMerger {
private static final Double THRESHOLD = 0.95;
+ private AuthorMerger() {
+ }
+
public static List merge(List> authors) {
authors.sort((o1, o2) -> -Integer.compare(countAuthorsPids(o1), countAuthorsPids(o2)));
@@ -32,44 +35,54 @@ public class AuthorMerger {
}
- public static List mergeAuthor(final List a, final List b) {
+ public static List mergeAuthor(final List a, final List b, Double threshold) {
int pa = countAuthorsPids(a);
int pb = countAuthorsPids(b);
- List base, enrich;
+ List base;
+ List enrich;
int sa = authorsSize(a);
int sb = authorsSize(b);
- if (pa == pb) {
- base = sa > sb ? a : b;
- enrich = sa > sb ? b : a;
- } else {
+ if (sa == sb) {
base = pa > pb ? a : b;
enrich = pa > pb ? b : a;
+ } else {
+ base = sa > sb ? a : b;
+ enrich = sa > sb ? b : a;
}
- enrichPidFromList(base, enrich);
+ enrichPidFromList(base, enrich, threshold);
return base;
}
- private static void enrichPidFromList(List base, List enrich) {
+ public static List mergeAuthor(final List a, final List b) {
+ return mergeAuthor(a, b, THRESHOLD);
+ }
+
+ private static void enrichPidFromList(List base, List enrich, Double threshold) {
if (base == null || enrich == null)
return;
+
+ // (if an Author has more than 1 pid, it appears 2 times in the list)
final Map basePidAuthorMap = base
.stream()
- .filter(a -> a.getPid() != null && a.getPid().size() > 0)
+ .filter(a -> a.getPid() != null && !a.getPid().isEmpty())
.flatMap(
a -> a
.getPid()
.stream()
+ .filter(Objects::nonNull)
.map(p -> new Tuple2<>(pidToComparableString(p), a)))
.collect(Collectors.toMap(Tuple2::_1, Tuple2::_2, (x1, x2) -> x1));
+ // (list of pid that are missing in the other list)
final List> pidToEnrich = enrich
.stream()
- .filter(a -> a.getPid() != null && a.getPid().size() > 0)
+ .filter(a -> a.getPid() != null && !a.getPid().isEmpty())
.flatMap(
a -> a
.getPid()
.stream()
+ .filter(Objects::nonNull)
.filter(p -> !basePidAuthorMap.containsKey(pidToComparableString(p)))
.map(p -> new Tuple2<>(p, a)))
.collect(Collectors.toList());
@@ -83,10 +96,10 @@ public class AuthorMerger {
.max(Comparator.comparing(Tuple2::_1));
if (simAuthor.isPresent()) {
- double th = THRESHOLD;
+ double th = threshold;
// increase the threshold if the surname is too short
if (simAuthor.get()._2().getSurname() != null
- && simAuthor.get()._2().getSurname().length() <= 3)
+ && simAuthor.get()._2().getSurname().length() <= 3 && threshold > 0.0)
th = 0.99;
if (simAuthor.get()._1() > th) {
@@ -107,9 +120,9 @@ public class AuthorMerger {
}
public static String pidToComparableString(StructuredProperty pid) {
- return (pid.getQualifier() != null
- ? pid.getQualifier().getClassid() != null ? pid.getQualifier().getClassid().toLowerCase() : ""
- : "")
+ final String classid = pid.getQualifier().getClassid() != null ? pid.getQualifier().getClassid().toLowerCase()
+ : "";
+ return (pid.getQualifier() != null ? classid : "")
+ (pid.getValue() != null ? pid.getValue().toLowerCase() : "");
}
@@ -142,7 +155,7 @@ public class AuthorMerger {
}
private static boolean hasPid(Author a) {
- if (a == null || a.getPid() == null || a.getPid().size() == 0)
+ if (a == null || a.getPid() == null || a.getPid().isEmpty())
return false;
return a.getPid().stream().anyMatch(p -> p != null && StringUtils.isNotBlank(p.getValue()));
}
@@ -151,12 +164,15 @@ public class AuthorMerger {
if (StringUtils.isNotBlank(author.getSurname())) {
return new Person(author.getSurname() + ", " + author.getName(), false);
} else {
- return new Person(author.getFullname(), false);
+ if (StringUtils.isNotBlank(author.getFullname()))
+ return new Person(author.getFullname(), false);
+ else
+ return new Person("", false);
}
}
private static String normalize(final String s) {
- return nfd(s)
+ String[] normalized = nfd(s)
.toLowerCase()
// do not compact the regexes in a single expression, would cause StackOverflowError
// in case
@@ -166,7 +182,12 @@ public class AuthorMerger {
.replaceAll("(\\p{Punct})+", " ")
.replaceAll("(\\d)+", " ")
.replaceAll("(\\n)+", " ")
- .trim();
+ .trim()
+ .split(" ");
+
+ Arrays.sort(normalized);
+
+ return String.join(" ", normalized);
}
private static String nfd(final String s) {
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/DispatchEntitiesSparkJob.java b/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/DispatchEntitiesSparkJob.java
new file mode 100644
index 000000000..3f65d754f
--- /dev/null
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/DispatchEntitiesSparkJob.java
@@ -0,0 +1,97 @@
+
+package eu.dnetlib.dhp.oa.merge;
+
+import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.spark.SparkConf;
+import org.apache.spark.api.java.function.FilterFunction;
+import org.apache.spark.api.java.function.MapFunction;
+import org.apache.spark.sql.Encoders;
+import org.apache.spark.sql.SaveMode;
+import org.apache.spark.sql.SparkSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.application.ArgumentApplicationParser;
+import eu.dnetlib.dhp.common.HdfsSupport;
+import eu.dnetlib.dhp.schema.oaf.Oaf;
+import eu.dnetlib.dhp.schema.oaf.OafEntity;
+
+public class DispatchEntitiesSparkJob {
+
+ private static final Logger log = LoggerFactory.getLogger(DispatchEntitiesSparkJob.class);
+
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+
+ public static void main(String[] args) throws Exception {
+
+ String jsonConfiguration = IOUtils
+ .toString(
+ Objects
+ .requireNonNull(
+ DispatchEntitiesSparkJob.class
+ .getResourceAsStream(
+ "/eu/dnetlib/dhp/oa/merge/dispatch_entities_parameters.json")));
+ final ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
+ parser.parseArgument(args);
+
+ Boolean isSparkSessionManaged = Optional
+ .ofNullable(parser.get("isSparkSessionManaged"))
+ .map(Boolean::valueOf)
+ .orElse(Boolean.TRUE);
+ log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
+
+ String inputPath = parser.get("inputPath");
+ log.info("inputPath: {}", inputPath);
+
+ String outputPath = parser.get("outputPath");
+ log.info("outputPath: {}", outputPath);
+
+ String graphTableClassName = parser.get("graphTableClassName");
+ log.info("graphTableClassName: {}", graphTableClassName);
+
+ @SuppressWarnings("unchecked")
+ Class entityClazz = (Class) Class.forName(graphTableClassName);
+
+ SparkConf conf = new SparkConf();
+ runWithSparkSession(
+ conf,
+ isSparkSessionManaged,
+ spark -> {
+ HdfsSupport.remove(outputPath, spark.sparkContext().hadoopConfiguration());
+ dispatchEntities(spark, inputPath, entityClazz, outputPath);
+ });
+ }
+
+ private static void dispatchEntities(
+ SparkSession spark,
+ String inputPath,
+ Class clazz,
+ String outputPath) {
+
+ spark
+ .read()
+ .textFile(inputPath)
+ .filter((FilterFunction) s -> isEntityType(s, clazz))
+ .map((MapFunction) s -> StringUtils.substringAfter(s, "|"), Encoders.STRING())
+ .map(
+ (MapFunction) value -> OBJECT_MAPPER.readValue(value, clazz),
+ Encoders.bean(clazz))
+ .write()
+ .mode(SaveMode.Overwrite)
+ .option("compression", "gzip")
+ .json(outputPath);
+ }
+
+ private static boolean isEntityType(final String s, final Class clazz) {
+ return StringUtils.substringBefore(s, "|").equals(clazz.getName());
+ }
+
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/GroupEntitiesSparkJob.java b/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/GroupEntitiesSparkJob.java
new file mode 100644
index 000000000..e652bd5b6
--- /dev/null
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/oa/merge/GroupEntitiesSparkJob.java
@@ -0,0 +1,203 @@
+
+package eu.dnetlib.dhp.oa.merge;
+
+import static eu.dnetlib.dhp.common.SparkSessionSupport.runWithSparkSession;
+import static eu.dnetlib.dhp.utils.DHPUtils.toSeq;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.spark.SparkConf;
+import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.api.java.function.FilterFunction;
+import org.apache.spark.api.java.function.MapFunction;
+import org.apache.spark.sql.*;
+import org.apache.spark.sql.expressions.Aggregator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.Configuration;
+import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
+import com.jayway.jsonpath.Option;
+
+import eu.dnetlib.dhp.application.ArgumentApplicationParser;
+import eu.dnetlib.dhp.common.HdfsSupport;
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.*;
+import eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils;
+import scala.Tuple2;
+
+/**
+ * Groups the graph content by entity identifier to ensure ID uniqueness
+ */
+public class GroupEntitiesSparkJob {
+
+ private static final Logger log = LoggerFactory.getLogger(GroupEntitiesSparkJob.class);
+
+ private static final String ID_JPATH = "$.id";
+
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+ public static void main(String[] args) throws Exception {
+
+ String jsonConfiguration = IOUtils
+ .toString(
+ GroupEntitiesSparkJob.class
+ .getResourceAsStream(
+ "/eu/dnetlib/dhp/oa/merge/group_graph_entities_parameters.json"));
+ final ArgumentApplicationParser parser = new ArgumentApplicationParser(jsonConfiguration);
+ parser.parseArgument(args);
+
+ Boolean isSparkSessionManaged = Optional
+ .ofNullable(parser.get("isSparkSessionManaged"))
+ .map(Boolean::valueOf)
+ .orElse(Boolean.TRUE);
+ log.info("isSparkSessionManaged: {}", isSparkSessionManaged);
+
+ String graphInputPath = parser.get("graphInputPath");
+ log.info("graphInputPath: {}", graphInputPath);
+
+ String outputPath = parser.get("outputPath");
+ log.info("outputPath: {}", outputPath);
+
+ SparkConf conf = new SparkConf();
+ conf.set("spark.serializer", "org.apache.spark.serializer.KryoSerializer");
+ conf.registerKryoClasses(ModelSupport.getOafModelClasses());
+
+ runWithSparkSession(
+ conf,
+ isSparkSessionManaged,
+ spark -> {
+ HdfsSupport.remove(outputPath, spark.sparkContext().hadoopConfiguration());
+ groupEntities(spark, graphInputPath, outputPath);
+ });
+ }
+
+ private static void groupEntities(
+ SparkSession spark,
+ String inputPath,
+ String outputPath) {
+
+ final TypedColumn aggregator = new GroupingAggregator().toColumn();
+ final JavaSparkContext sc = JavaSparkContext.fromSparkContext(spark.sparkContext());
+ spark
+ .read()
+ .textFile(toSeq(listEntityPaths(inputPath, sc)))
+ .map((MapFunction) GroupEntitiesSparkJob::parseOaf, Encoders.kryo(OafEntity.class))
+ .filter((FilterFunction) e -> StringUtils.isNotBlank(ModelSupport.idFn().apply(e)))
+ .groupByKey((MapFunction) oaf -> ModelSupport.idFn().apply(oaf), Encoders.STRING())
+ .agg(aggregator)
+ .map(
+ (MapFunction, String>) t -> t._2().getClass().getName() +
+ "|" + OBJECT_MAPPER.writeValueAsString(t._2()),
+ Encoders.STRING())
+ .write()
+ .option("compression", "gzip")
+ .mode(SaveMode.Overwrite)
+ .text(outputPath);
+ }
+
+ public static class GroupingAggregator extends Aggregator {
+
+ @Override
+ public OafEntity zero() {
+ return null;
+ }
+
+ @Override
+ public OafEntity reduce(OafEntity b, OafEntity a) {
+ return mergeAndGet(b, a);
+ }
+
+ private OafEntity mergeAndGet(OafEntity b, OafEntity a) {
+ if (Objects.nonNull(a) && Objects.nonNull(b)) {
+ return OafMapperUtils.mergeEntities(b, a);
+ }
+ return Objects.isNull(a) ? b : a;
+ }
+
+ @Override
+ public OafEntity merge(OafEntity b, OafEntity a) {
+ return mergeAndGet(b, a);
+ }
+
+ @Override
+ public OafEntity finish(OafEntity j) {
+ return j;
+ }
+
+ @Override
+ public Encoder bufferEncoder() {
+ return Encoders.kryo(OafEntity.class);
+ }
+
+ @Override
+ public Encoder outputEncoder() {
+ return Encoders.kryo(OafEntity.class);
+ }
+
+ }
+
+ private static OafEntity parseOaf(String s) {
+
+ DocumentContext dc = JsonPath
+ .parse(s, Configuration.defaultConfiguration().addOptions(Option.SUPPRESS_EXCEPTIONS));
+ final String id = dc.read(ID_JPATH);
+ if (StringUtils.isNotBlank(id)) {
+
+ String prefix = StringUtils.substringBefore(id, "|");
+ switch (prefix) {
+ case "10":
+ return parse(s, Datasource.class);
+ case "20":
+ return parse(s, Organization.class);
+ case "40":
+ return parse(s, Project.class);
+ case "50":
+ String resultType = dc.read("$.resulttype.classid");
+ switch (resultType) {
+ case "publication":
+ return parse(s, Publication.class);
+ case "dataset":
+ return parse(s, eu.dnetlib.dhp.schema.oaf.Dataset.class);
+ case "software":
+ return parse(s, Software.class);
+ case "other":
+ return parse(s, OtherResearchProduct.class);
+ default:
+ throw new IllegalArgumentException(String.format("invalid resultType: '%s'", resultType));
+ }
+ default:
+ throw new IllegalArgumentException(String.format("invalid id prefix: '%s'", prefix));
+ }
+ } else {
+ throw new IllegalArgumentException(String.format("invalid oaf: '%s'", s));
+ }
+ }
+
+ private static OafEntity parse(String s, Class clazz) {
+ try {
+ return OBJECT_MAPPER.readValue(s, clazz);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ private static List listEntityPaths(String inputPath, JavaSparkContext sc) {
+ return HdfsSupport
+ .listFiles(inputPath, sc.hadoopConfiguration())
+ .stream()
+ .filter(f -> !f.toLowerCase().contains("relation"))
+ .collect(Collectors.toList());
+ }
+
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java b/dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java
index 9ac0a0bf7..fd4c0191a 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java
@@ -12,6 +12,9 @@ import com.ximpleware.VTDNav;
/** Created by sandro on 9/29/16. */
public class VtdUtilityParser {
+ private VtdUtilityParser() {
+ }
+
public static List getTextValuesWithAttributes(
final AutoPilot ap, final VTDNav vn, final String xpath, final List attributes)
throws VtdException {
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
deleted file mode 100644
index 12fbcc490..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/CleaningFunctions.java
+++ /dev/null
@@ -1,238 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.util.LinkedHashMap;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.clearspring.analytics.util.Lists;
-
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-public class CleaningFunctions {
-
- public static final String DOI_URL_PREFIX_REGEX = "(^http(s?):\\/\\/)(((dx\\.)?doi\\.org)|(handle\\.test\\.datacite\\.org))\\/";
- public static final String ORCID_PREFIX_REGEX = "^http(s?):\\/\\/orcid\\.org\\/";
- public static final String NONE = "none";
-
- public static T fixVocabularyNames(T value) {
- if (value instanceof Datasource) {
- // nothing to clean here
- } else if (value instanceof Project) {
- // nothing to clean here
- } else if (value instanceof Organization) {
- Organization o = (Organization) value;
- if (Objects.nonNull(o.getCountry())) {
- fixVocabName(o.getCountry(), ModelConstants.DNET_COUNTRY_TYPE);
- }
- } else if (value instanceof Relation) {
- // nothing to clean here
- } else if (value instanceof Result) {
-
- Result r = (Result) value;
-
- fixVocabName(r.getLanguage(), ModelConstants.DNET_LANGUAGES);
- fixVocabName(r.getResourcetype(), ModelConstants.DNET_DATA_CITE_RESOURCE);
- fixVocabName(r.getBestaccessright(), ModelConstants.DNET_ACCESS_MODES);
-
- if (Objects.nonNull(r.getSubject())) {
- r.getSubject().forEach(s -> fixVocabName(s.getQualifier(), ModelConstants.DNET_SUBJECT_TYPOLOGIES));
- }
- if (Objects.nonNull(r.getInstance())) {
- for (Instance i : r.getInstance()) {
- fixVocabName(i.getAccessright(), ModelConstants.DNET_ACCESS_MODES);
- fixVocabName(i.getRefereed(), ModelConstants.DNET_REVIEW_LEVELS);
- }
- }
- if (Objects.nonNull(r.getAuthor())) {
- r.getAuthor().forEach(a -> {
- if (Objects.nonNull(a.getPid())) {
- a.getPid().forEach(p -> {
- fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
- });
- }
- });
- }
- if (value instanceof Publication) {
-
- } else if (value instanceof eu.dnetlib.dhp.schema.oaf.Dataset) {
-
- } else if (value instanceof OtherResearchProduct) {
-
- } else if (value instanceof Software) {
-
- }
- }
-
- return value;
- }
-
- public static T fixDefaults(T value) {
- if (value instanceof Datasource) {
- // nothing to clean here
- } else if (value instanceof Project) {
- // nothing to clean here
- } else if (value instanceof Organization) {
- Organization o = (Organization) value;
- if (Objects.isNull(o.getCountry()) || StringUtils.isBlank(o.getCountry().getClassid())) {
- o.setCountry(qualifier("UNKNOWN", "Unknown", ModelConstants.DNET_COUNTRY_TYPE));
- }
- } else if (value instanceof Relation) {
- // nothing to clean here
- } else if (value instanceof Result) {
-
- Result r = (Result) value;
- if (Objects.nonNull(r.getPublisher()) && StringUtils.isBlank(r.getPublisher().getValue())) {
- r.setPublisher(null);
- }
- if (Objects.isNull(r.getLanguage()) || StringUtils.isBlank(r.getLanguage().getClassid())) {
- r
- .setLanguage(
- qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
- }
- if (Objects.nonNull(r.getSubject())) {
- r
- .setSubject(
- r
- .getSubject()
- .stream()
- .filter(Objects::nonNull)
- .filter(sp -> StringUtils.isNotBlank(sp.getValue()))
- .filter(sp -> Objects.nonNull(sp.getQualifier()))
- .filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
- .collect(Collectors.toList()));
- }
- if (Objects.nonNull(r.getPid())) {
- r
- .setPid(
- r
- .getPid()
- .stream()
- .filter(Objects::nonNull)
- .filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
- .filter(sp -> NONE.equalsIgnoreCase(sp.getValue()))
- .filter(sp -> Objects.nonNull(sp.getQualifier()))
- .filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
- .map(CleaningFunctions::normalizePidValue)
- .collect(Collectors.toList()));
- }
- if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
- r
- .setResourcetype(
- qualifier("UNKNOWN", "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
- }
- if (Objects.nonNull(r.getInstance())) {
- for (Instance i : r.getInstance()) {
- if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
- i.setAccessright(qualifier("UNKNOWN", "not available", ModelConstants.DNET_ACCESS_MODES));
- }
- if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
- i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
- }
- if (Objects.isNull(i.getRefereed())) {
- i.setRefereed(qualifier("0000", "Unknown", ModelConstants.DNET_REVIEW_LEVELS));
- }
- }
- }
- if (Objects.isNull(r.getBestaccessright()) || StringUtils.isBlank(r.getBestaccessright().getClassid())) {
- Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
- if (Objects.isNull(bestaccessrights)) {
- r
- .setBestaccessright(
- qualifier("UNKNOWN", "not available", ModelConstants.DNET_ACCESS_MODES));
- } else {
- r.setBestaccessright(bestaccessrights);
- }
- }
- if (Objects.nonNull(r.getAuthor())) {
- boolean nullRank = r
- .getAuthor()
- .stream()
- .anyMatch(a -> Objects.isNull(a.getRank()));
- if (nullRank) {
- int i = 1;
- for (Author author : r.getAuthor()) {
- author.setRank(i++);
- }
- }
- for (Author a : r.getAuthor()) {
- if (Objects.isNull(a.getPid())) {
- a.setPid(Lists.newArrayList());
- } else {
- a
- .setPid(
- a
- .getPid()
- .stream()
- .filter(p -> Objects.nonNull(p.getQualifier()))
- .filter(p -> StringUtils.isNotBlank(p.getValue()))
- .map(p -> {
- p.setValue(p.getValue().trim().replaceAll(ORCID_PREFIX_REGEX, ""));
- return p;
- })
- .collect(
- Collectors
- .toMap(
- StructuredProperty::getValue, Function.identity(), (p1, p2) -> p1,
- LinkedHashMap::new))
- .values()
- .stream()
- .collect(Collectors.toList()));
- }
- }
-
- }
- if (value instanceof Publication) {
-
- } else if (value instanceof eu.dnetlib.dhp.schema.oaf.Dataset) {
-
- } else if (value instanceof OtherResearchProduct) {
-
- } else if (value instanceof Software) {
-
- }
- }
-
- return value;
- }
-
- // HELPERS
-
- private static void fixVocabName(Qualifier q, String vocabularyName) {
- if (Objects.nonNull(q) && StringUtils.isBlank(q.getSchemeid())) {
- q.setSchemeid(vocabularyName);
- q.setSchemename(vocabularyName);
- }
- }
-
- private static Qualifier qualifier(String classid, String classname, String scheme) {
- return OafMapperUtils
- .qualifier(
- classid, classname, scheme, scheme);
- }
-
- /**
- * Utility method that normalises PID values on a per-type basis.
- * @param pid the PID whose value will be normalised.
- * @return the PID containing the normalised value.
- */
- public static StructuredProperty normalizePidValue(StructuredProperty pid) {
- String value = Optional
- .ofNullable(pid.getValue())
- .map(String::trim)
- .orElseThrow(() -> new IllegalArgumentException("PID value cannot be empty"));
- switch (pid.getQualifier().getClassid()) {
-
- // TODO add cleaning for more PID types as needed
- case "doi":
- pid.setValue(value.toLowerCase().replaceAll(DOI_URL_PREFIX_REGEX, ""));
- break;
- }
- return pid;
- }
-
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ModelHardLimits.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ModelHardLimits.java
deleted file mode 100644
index 16fdc3760..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ModelHardLimits.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-public class ModelHardLimits {
-
- public static final int MAX_EXTERNAL_ENTITIES = 50;
- public static final int MAX_AUTHORS = 200;
- public static final int MAX_AUTHOR_FULLNAME_LENGTH = 1000;
- public static final int MAX_TITLE_LENGTH = 5000;
- public static final int MAX_TITLES = 10;
- public static final int MAX_ABSTRACT_LENGTH = 150000;
- public static final int MAX_INSTANCES = 10;
-
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/OafMapperUtils.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/OafMapperUtils.java
deleted file mode 100644
index f079c55af..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/OafMapperUtils.java
+++ /dev/null
@@ -1,296 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import static eu.dnetlib.dhp.schema.common.ModelConstants.*;
-import static eu.dnetlib.dhp.schema.common.ModelConstants.DNET_ACCESS_MODES;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-
-import eu.dnetlib.dhp.schema.common.LicenseComparator;
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-public class OafMapperUtils {
-
- public static KeyValue keyValue(final String k, final String v) {
- final KeyValue kv = new KeyValue();
- kv.setKey(k);
- kv.setValue(v);
- return kv;
- }
-
- public static List listKeyValues(final String... s) {
- if (s.length % 2 > 0) {
- throw new RuntimeException("Invalid number of parameters (k,v,k,v,....)");
- }
-
- final List list = new ArrayList<>();
- for (int i = 0; i < s.length; i += 2) {
- list.add(keyValue(s[i], s[i + 1]));
- }
- return list;
- }
-
- public static Field field(final T value, final DataInfo info) {
- if (value == null || StringUtils.isBlank(value.toString())) {
- return null;
- }
-
- final Field field = new Field<>();
- field.setValue(value);
- field.setDataInfo(info);
- return field;
- }
-
- public static List> listFields(final DataInfo info, final String... values) {
- return Arrays
- .stream(values)
- .map(v -> field(v, info))
- .filter(Objects::nonNull)
- .filter(distinctByKey(f -> f.getValue()))
- .collect(Collectors.toList());
- }
-
- public static List> listFields(final DataInfo info, final List values) {
- return values
- .stream()
- .map(v -> field(v, info))
- .filter(Objects::nonNull)
- .filter(distinctByKey(f -> f.getValue()))
- .collect(Collectors.toList());
- }
-
- public static Qualifier unknown(final String schemeid, final String schemename) {
- return qualifier("UNKNOWN", "Unknown", schemeid, schemename);
- }
-
- public static Qualifier qualifier(
- final String classid,
- final String classname,
- final String schemeid,
- final String schemename) {
- final Qualifier q = new Qualifier();
- q.setClassid(classid);
- q.setClassname(classname);
- q.setSchemeid(schemeid);
- q.setSchemename(schemename);
- return q;
- }
-
- public static StructuredProperty structuredProperty(
- final String value,
- final String classid,
- final String classname,
- final String schemeid,
- final String schemename,
- final DataInfo dataInfo) {
-
- return structuredProperty(value, qualifier(classid, classname, schemeid, schemename), dataInfo);
- }
-
- public static StructuredProperty structuredProperty(
- final String value,
- final Qualifier qualifier,
- final DataInfo dataInfo) {
- if (value == null) {
- return null;
- }
- final StructuredProperty sp = new StructuredProperty();
- sp.setValue(value);
- sp.setQualifier(qualifier);
- sp.setDataInfo(dataInfo);
- return sp;
- }
-
- public static ExtraInfo extraInfo(
- final String name,
- final String value,
- final String typology,
- final String provenance,
- final String trust) {
- final ExtraInfo info = new ExtraInfo();
- info.setName(name);
- info.setValue(value);
- info.setTypology(typology);
- info.setProvenance(provenance);
- info.setTrust(trust);
- return info;
- }
-
- public static OAIProvenance oaiIProvenance(
- final String identifier,
- final String baseURL,
- final String metadataNamespace,
- final Boolean altered,
- final String datestamp,
- final String harvestDate) {
-
- final OriginDescription desc = new OriginDescription();
- desc.setIdentifier(identifier);
- desc.setBaseURL(baseURL);
- desc.setMetadataNamespace(metadataNamespace);
- desc.setAltered(altered);
- desc.setDatestamp(datestamp);
- desc.setHarvestDate(harvestDate);
-
- final OAIProvenance p = new OAIProvenance();
- p.setOriginDescription(desc);
-
- return p;
- }
-
- public static Journal journal(
- final String name,
- final String issnPrinted,
- final String issnOnline,
- final String issnLinking,
- final DataInfo dataInfo) {
- return journal(
- name,
- issnPrinted,
- issnOnline,
- issnLinking,
- null,
- null,
- null,
- null,
- null,
- null,
- null,
- dataInfo);
- }
-
- public static Journal journal(
- final String name,
- final String issnPrinted,
- final String issnOnline,
- final String issnLinking,
- final String ep,
- final String iss,
- final String sp,
- final String vol,
- final String edition,
- final String conferenceplace,
- final String conferencedate,
- final DataInfo dataInfo) {
-
- if (StringUtils.isNotBlank(name)
- || StringUtils.isNotBlank(issnPrinted)
- || StringUtils.isNotBlank(issnOnline)
- || StringUtils.isNotBlank(issnLinking)) {
- final Journal j = new Journal();
- j.setName(name);
- j.setIssnPrinted(issnPrinted);
- j.setIssnOnline(issnOnline);
- j.setIssnLinking(issnLinking);
- j.setEp(ep);
- j.setIss(iss);
- j.setSp(sp);
- j.setVol(vol);
- j.setEdition(edition);
- j.setConferenceplace(conferenceplace);
- j.setConferencedate(conferencedate);
- j.setDataInfo(dataInfo);
- return j;
- } else {
- return null;
- }
- }
-
- public static DataInfo dataInfo(
- final Boolean deletedbyinference,
- final String inferenceprovenance,
- final Boolean inferred,
- final Boolean invisible,
- final Qualifier provenanceaction,
- final String trust) {
- final DataInfo d = new DataInfo();
- d.setDeletedbyinference(deletedbyinference);
- d.setInferenceprovenance(inferenceprovenance);
- d.setInferred(inferred);
- d.setInvisible(invisible);
- d.setProvenanceaction(provenanceaction);
- d.setTrust(trust);
- return d;
- }
-
- public static String createOpenaireId(
- final int prefix,
- final String originalId,
- final boolean to_md5) {
- if (StringUtils.isBlank(originalId)) {
- return null;
- } else if (to_md5) {
- final String nsPrefix = StringUtils.substringBefore(originalId, "::");
- final String rest = StringUtils.substringAfter(originalId, "::");
- return String.format("%s|%s::%s", prefix, nsPrefix, DHPUtils.md5(rest));
- } else {
- return String.format("%s|%s", prefix, originalId);
- }
- }
-
- public static String createOpenaireId(
- final String type,
- final String originalId,
- final boolean to_md5) {
- switch (type) {
- case "datasource":
- return createOpenaireId(10, originalId, to_md5);
- case "organization":
- return createOpenaireId(20, originalId, to_md5);
- case "person":
- return createOpenaireId(30, originalId, to_md5);
- case "project":
- return createOpenaireId(40, originalId, to_md5);
- default:
- return createOpenaireId(50, originalId, to_md5);
- }
- }
-
- public static String asString(final Object o) {
- return o == null ? "" : o.toString();
- }
-
- public static Predicate distinctByKey(
- final Function keyExtractor) {
- final Map seen = new ConcurrentHashMap<>();
- return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
- }
-
- public static Qualifier createBestAccessRights(final List instanceList) {
- return getBestAccessRights(instanceList);
- }
-
- protected static Qualifier getBestAccessRights(final List instanceList) {
- if (instanceList != null) {
- final Optional min = instanceList
- .stream()
- .map(i -> i.getAccessright())
- .min(new LicenseComparator());
-
- final Qualifier rights = min.isPresent() ? min.get() : new Qualifier();
-
- if (StringUtils.isBlank(rights.getClassid())) {
- rights.setClassid(UNKNOWN);
- }
- if (StringUtils.isBlank(rights.getClassname())
- || UNKNOWN.equalsIgnoreCase(rights.getClassname())) {
- rights.setClassname(NOT_AVAILABLE);
- }
- if (StringUtils.isBlank(rights.getSchemeid())) {
- rights.setSchemeid(DNET_ACCESS_MODES);
- }
- if (StringUtils.isBlank(rights.getSchemename())) {
- rights.setSchemename(DNET_ACCESS_MODES);
- }
-
- return rights;
- }
- return null;
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ResultTypeComparator.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ResultTypeComparator.java
deleted file mode 100644
index 6c11d1a85..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/ResultTypeComparator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf;
-
-import java.util.Comparator;
-
-import eu.dnetlib.dhp.schema.common.ModelConstants;
-
-public class ResultTypeComparator implements Comparator {
-
- @Override
- public int compare(Result left, Result right) {
-
- if (left == null && right == null)
- return 0;
- if (left == null)
- return 1;
- if (right == null)
- return -1;
-
- String lClass = left.getResulttype().getClassid();
- String rClass = right.getResulttype().getClassid();
-
- if (lClass.equals(rClass))
- return 0;
-
- if (lClass.equals(ModelConstants.PUBLICATION_RESULTTYPE_CLASSID))
- return -1;
- if (rClass.equals(ModelConstants.PUBLICATION_RESULTTYPE_CLASSID))
- return 1;
-
- if (lClass.equals(ModelConstants.DATASET_RESULTTYPE_CLASSID))
- return -1;
- if (rClass.equals(ModelConstants.DATASET_RESULTTYPE_CLASSID))
- return 1;
-
- if (lClass.equals(ModelConstants.SOFTWARE_RESULTTYPE_CLASSID))
- return -1;
- if (rClass.equals(ModelConstants.SOFTWARE_RESULTTYPE_CLASSID))
- return 1;
-
- if (lClass.equals(ModelConstants.ORP_RESULTTYPE_CLASSID))
- return -1;
- if (rClass.equals(ModelConstants.ORP_RESULTTYPE_CLASSID))
- return 1;
-
- // Else (but unlikely), lexicographical ordering will do.
- return lClass.compareTo(rClass);
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
new file mode 100644
index 000000000..363f95423
--- /dev/null
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
@@ -0,0 +1,538 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils.getProvenance;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.github.sisyphsu.dateparser.DateParserUtils;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import eu.dnetlib.dhp.common.vocabulary.VocabularyGroup;
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.*;
+import me.xuender.unidecode.Unidecode;
+
+public class GraphCleaningFunctions extends CleaningFunctions {
+
+ public static final String ORCID_CLEANING_REGEX = ".*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9]{4}).*[-–—−=].*([0-9x]{4})";
+ public static final int ORCID_LEN = 19;
+ public static final String CLEANING_REGEX = "(?:\\n|\\r|\\t)";
+ public static final String INVALID_AUTHOR_REGEX = ".*deactivated.*";
+
+ public static final String TITLE_TEST = "test";
+ public static final String TITLE_FILTER_REGEX = String.format("(%s)|\\W|\\d", TITLE_TEST);
+
+ public static final int TITLE_FILTER_RESIDUAL_LENGTH = 5;
+
+ public static T fixVocabularyNames(T value) {
+ if (value instanceof Datasource) {
+ // nothing to clean here
+ } else if (value instanceof Project) {
+ // nothing to clean here
+ } else if (value instanceof Organization) {
+ Organization o = (Organization) value;
+ if (Objects.nonNull(o.getCountry())) {
+ fixVocabName(o.getCountry(), ModelConstants.DNET_COUNTRY_TYPE);
+ }
+ } else if (value instanceof Relation) {
+ // nothing to clean here
+ } else if (value instanceof Result) {
+
+ Result r = (Result) value;
+
+ fixVocabName(r.getLanguage(), ModelConstants.DNET_LANGUAGES);
+ fixVocabName(r.getResourcetype(), ModelConstants.DNET_DATA_CITE_RESOURCE);
+ fixVocabName(r.getBestaccessright(), ModelConstants.DNET_ACCESS_MODES);
+
+ if (Objects.nonNull(r.getSubject())) {
+ r.getSubject().forEach(s -> fixVocabName(s.getQualifier(), ModelConstants.DNET_SUBJECT_TYPOLOGIES));
+ }
+ if (Objects.nonNull(r.getInstance())) {
+ for (Instance i : r.getInstance()) {
+ fixVocabName(i.getAccessright(), ModelConstants.DNET_ACCESS_MODES);
+ fixVocabName(i.getRefereed(), ModelConstants.DNET_REVIEW_LEVELS);
+ }
+ }
+ if (Objects.nonNull(r.getAuthor())) {
+ r.getAuthor().stream().filter(Objects::nonNull).forEach(a -> {
+ if (Objects.nonNull(a.getPid())) {
+ a.getPid().stream().filter(Objects::nonNull).forEach(p -> {
+ fixVocabName(p.getQualifier(), ModelConstants.DNET_PID_TYPES);
+ });
+ }
+ });
+ }
+ if (value instanceof Publication) {
+
+ } else if (value instanceof Dataset) {
+
+ } else if (value instanceof OtherResearchProduct) {
+
+ } else if (value instanceof Software) {
+
+ }
+ }
+
+ return value;
+ }
+
+ public static boolean filter(T value) {
+ if (Boolean.TRUE
+ .equals(
+ Optional
+ .ofNullable(value)
+ .map(
+ o -> Optional
+ .ofNullable(o.getDataInfo())
+ .map(
+ d -> Optional
+ .ofNullable(d.getInvisible())
+ .orElse(true))
+ .orElse(true))
+ .orElse(true))) {
+ return true;
+ }
+
+ if (value instanceof Datasource) {
+ // nothing to evaluate here
+ } else if (value instanceof Project) {
+ // nothing to evaluate here
+ } else if (value instanceof Organization) {
+ // nothing to evaluate here
+ } else if (value instanceof Relation) {
+ // nothing to clean here
+ } else if (value instanceof Result) {
+
+ Result r = (Result) value;
+
+ if (Objects.isNull(r.getTitle()) || r.getTitle().isEmpty()) {
+ return false;
+ }
+
+ if (value instanceof Publication) {
+
+ } else if (value instanceof Dataset) {
+
+ } else if (value instanceof OtherResearchProduct) {
+
+ } else if (value instanceof Software) {
+
+ }
+ }
+ return true;
+ }
+
+ public static T cleanup(T value, VocabularyGroup vocs) {
+ if (value instanceof Datasource) {
+ // nothing to clean here
+ } else if (value instanceof Project) {
+ // nothing to clean here
+ } else if (value instanceof Organization) {
+ Organization o = (Organization) value;
+ if (Objects.isNull(o.getCountry()) || StringUtils.isBlank(o.getCountry().getClassid())) {
+ o.setCountry(ModelConstants.UNKNOWN_COUNTRY);
+ }
+ } else if (value instanceof Relation) {
+ Relation r = (Relation) value;
+
+ Optional validationDate = doCleanDate(r.getValidationDate());
+ if (validationDate.isPresent()) {
+ r.setValidationDate(validationDate.get());
+ r.setValidated(true);
+ } else {
+ r.setValidationDate(null);
+ r.setValidated(false);
+ }
+ } else if (value instanceof Result) {
+
+ Result r = (Result) value;
+
+ if (Objects.nonNull(r.getDateofacceptance())) {
+ Optional date = cleanDateField(r.getDateofacceptance());
+ if (date.isPresent()) {
+ r.getDateofacceptance().setValue(date.get());
+ } else {
+ r.setDateofacceptance(null);
+ }
+ }
+ if (Objects.nonNull(r.getRelevantdate())) {
+ r
+ .setRelevantdate(
+ r
+ .getRelevantdate()
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(sp -> Objects.nonNull(sp.getQualifier()))
+ .filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+ .map(sp -> {
+ sp.setValue(GraphCleaningFunctions.cleanDate(sp.getValue()));
+ return sp;
+ })
+ .filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+ .collect(Collectors.toList()));
+ }
+ if (Objects.nonNull(r.getPublisher()) && StringUtils.isBlank(r.getPublisher().getValue())) {
+ r.setPublisher(null);
+ }
+ if (Objects.isNull(r.getLanguage()) || StringUtils.isBlank(r.getLanguage().getClassid())) {
+ r
+ .setLanguage(
+ qualifier("und", "Undetermined", ModelConstants.DNET_LANGUAGES));
+ }
+ if (Objects.nonNull(r.getSubject())) {
+ List subjects = Lists
+ .newArrayList(
+ r
+ .getSubject()
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+ .filter(sp -> Objects.nonNull(sp.getQualifier()))
+ .filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+ .map(GraphCleaningFunctions::cleanValue)
+ .collect(
+ Collectors
+ .toMap(
+ s -> Optional
+ .ofNullable(s.getQualifier())
+ .map(q -> q.getClassid() + s.getValue())
+ .orElse(s.getValue()),
+ Function.identity(),
+ (s1, s2) -> Collections
+ .min(Lists.newArrayList(s1, s2), new SubjectProvenanceComparator())))
+ .values());
+ r.setSubject(subjects);
+ }
+ if (Objects.nonNull(r.getTitle())) {
+ r
+ .setTitle(
+ r
+ .getTitle()
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+ .filter(
+ sp -> {
+ final String title = sp
+ .getValue()
+ .toLowerCase();
+ final String decoded = Unidecode.decode(title);
+
+ if (StringUtils.contains(decoded, TITLE_TEST)) {
+ return decoded
+ .replaceAll(TITLE_FILTER_REGEX, "")
+ .length() > TITLE_FILTER_RESIDUAL_LENGTH;
+ }
+ return !decoded
+ .replaceAll("\\W|\\d", "")
+ .isEmpty();
+ })
+ .map(GraphCleaningFunctions::cleanValue)
+ .collect(Collectors.toList()));
+ }
+ if (Objects.nonNull(r.getFormat())) {
+ r
+ .setFormat(
+ r
+ .getFormat()
+ .stream()
+ .map(GraphCleaningFunctions::cleanValue)
+ .collect(Collectors.toList()));
+ }
+ if (Objects.nonNull(r.getDescription())) {
+ r
+ .setDescription(
+ r
+ .getDescription()
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(sp -> StringUtils.isNotBlank(sp.getValue()))
+ .map(GraphCleaningFunctions::cleanValue)
+ .collect(Collectors.toList()));
+ }
+ if (Objects.nonNull(r.getPid())) {
+ r.setPid(processPidCleaning(r.getPid()));
+ }
+ if (Objects.isNull(r.getResourcetype()) || StringUtils.isBlank(r.getResourcetype().getClassid())) {
+ r
+ .setResourcetype(
+ qualifier(ModelConstants.UNKNOWN, "Unknown", ModelConstants.DNET_DATA_CITE_RESOURCE));
+ }
+ if (Objects.nonNull(r.getInstance())) {
+
+ for (Instance i : r.getInstance()) {
+ if (!vocs.termExists(ModelConstants.DNET_PUBLICATION_RESOURCE, i.getInstancetype().getClassid())) {
+ if (r instanceof Publication) {
+ i
+ .setInstancetype(
+ OafMapperUtils
+ .qualifier(
+ "0038", "Other literature type", ModelConstants.DNET_PUBLICATION_RESOURCE,
+ ModelConstants.DNET_PUBLICATION_RESOURCE));
+ } else if (r instanceof Dataset) {
+ i
+ .setInstancetype(
+ OafMapperUtils
+ .qualifier(
+ "0039", "Other dataset type", ModelConstants.DNET_PUBLICATION_RESOURCE,
+ ModelConstants.DNET_PUBLICATION_RESOURCE));
+ } else if (r instanceof Software) {
+ i
+ .setInstancetype(
+ OafMapperUtils
+ .qualifier(
+ "0040", "Other software type", ModelConstants.DNET_PUBLICATION_RESOURCE,
+ ModelConstants.DNET_PUBLICATION_RESOURCE));
+ } else if (r instanceof OtherResearchProduct) {
+ i
+ .setInstancetype(
+ OafMapperUtils
+ .qualifier(
+ "0020", "Other ORP type", ModelConstants.DNET_PUBLICATION_RESOURCE,
+ ModelConstants.DNET_PUBLICATION_RESOURCE));
+ }
+ }
+
+ if (Objects.nonNull(i.getPid())) {
+ i.setPid(processPidCleaning(i.getPid()));
+ }
+ if (Objects.nonNull(i.getAlternateIdentifier())) {
+ i.setAlternateIdentifier(processPidCleaning(i.getAlternateIdentifier()));
+ }
+ Optional
+ .ofNullable(i.getPid())
+ .ifPresent(pid -> {
+ final Set pids = Sets.newHashSet(pid);
+ Optional
+ .ofNullable(i.getAlternateIdentifier())
+ .ifPresent(altId -> {
+ final Set altIds = Sets.newHashSet(altId);
+ i.setAlternateIdentifier(Lists.newArrayList(Sets.difference(altIds, pids)));
+ });
+ });
+
+ if (Objects.isNull(i.getAccessright()) || StringUtils.isBlank(i.getAccessright().getClassid())) {
+ i
+ .setAccessright(
+ accessRight(
+ ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
+ ModelConstants.DNET_ACCESS_MODES));
+ }
+ if (Objects.isNull(i.getHostedby()) || StringUtils.isBlank(i.getHostedby().getKey())) {
+ i.setHostedby(ModelConstants.UNKNOWN_REPOSITORY);
+ }
+ if (Objects.isNull(i.getRefereed())) {
+ i.setRefereed(qualifier("0000", "Unknown", ModelConstants.DNET_REVIEW_LEVELS));
+ }
+ if (Objects.nonNull(i.getDateofacceptance())) {
+ Optional date = cleanDateField(i.getDateofacceptance());
+ if (date.isPresent()) {
+ i.getDateofacceptance().setValue(date.get());
+ } else {
+ i.setDateofacceptance(null);
+ }
+ }
+ }
+ }
+ if (Objects.isNull(r.getBestaccessright()) || StringUtils.isBlank(r.getBestaccessright().getClassid())) {
+ Qualifier bestaccessrights = OafMapperUtils.createBestAccessRights(r.getInstance());
+ if (Objects.isNull(bestaccessrights)) {
+ r
+ .setBestaccessright(
+ qualifier(
+ ModelConstants.UNKNOWN, ModelConstants.NOT_AVAILABLE,
+ ModelConstants.DNET_ACCESS_MODES));
+ } else {
+ r.setBestaccessright(bestaccessrights);
+ }
+ }
+ if (Objects.nonNull(r.getAuthor())) {
+ r
+ .setAuthor(
+ r
+ .getAuthor()
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(a -> StringUtils.isNotBlank(a.getFullname()))
+ .filter(a -> StringUtils.isNotBlank(a.getFullname().replaceAll("[\\W]", "")))
+ .collect(Collectors.toList()));
+
+ boolean nullRank = r
+ .getAuthor()
+ .stream()
+ .anyMatch(a -> Objects.isNull(a.getRank()));
+ if (nullRank) {
+ int i = 1;
+ for (Author author : r.getAuthor()) {
+ author.setRank(i++);
+ }
+ }
+
+ for (Author a : r.getAuthor()) {
+ if (Objects.isNull(a.getPid())) {
+ a.setPid(Lists.newArrayList());
+ } else {
+ a
+ .setPid(
+ a
+ .getPid()
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(p -> Objects.nonNull(p.getQualifier()))
+ .filter(p -> StringUtils.isNotBlank(p.getValue()))
+ .map(p -> {
+ // hack to distinguish orcid from orcid_pending
+ String pidProvenance = getProvenance(p.getDataInfo());
+ if (p
+ .getQualifier()
+ .getClassid()
+ .toLowerCase()
+ .contains(ModelConstants.ORCID)) {
+ if (pidProvenance
+ .equals(ModelConstants.SYSIMPORT_CROSSWALK_ENTITYREGISTRY)) {
+ p.getQualifier().setClassid(ModelConstants.ORCID);
+ } else {
+ p.getQualifier().setClassid(ModelConstants.ORCID_PENDING);
+ }
+ final String orcid = p
+ .getValue()
+ .trim()
+ .toLowerCase()
+ .replaceAll(ORCID_CLEANING_REGEX, "$1-$2-$3-$4");
+ if (orcid.length() == ORCID_LEN) {
+ p.setValue(orcid);
+ } else {
+ p.setValue("");
+ }
+ }
+ return p;
+ })
+ .filter(p -> StringUtils.isNotBlank(p.getValue()))
+ .collect(
+ Collectors
+ .toMap(
+ p -> p.getQualifier().getClassid() + p.getValue(),
+ Function.identity(),
+ (p1, p2) -> p1,
+ LinkedHashMap::new))
+ .values()
+ .stream()
+ .collect(Collectors.toList()));
+ }
+ }
+ }
+ if (value instanceof Publication) {
+
+ } else if (value instanceof Dataset) {
+
+ } else if (value instanceof OtherResearchProduct) {
+
+ } else if (value instanceof Software) {
+
+ }
+ }
+
+ return value;
+ }
+
+ private static Optional cleanDateField(Field dateofacceptance) {
+ return Optional
+ .ofNullable(dateofacceptance)
+ .map(Field::getValue)
+ .map(GraphCleaningFunctions::cleanDate)
+ .filter(Objects::nonNull);
+ }
+
+ protected static Optional doCleanDate(String date) {
+ return Optional.ofNullable(cleanDate(date));
+ }
+
+ public static String cleanDate(final String inputDate) {
+
+ if (StringUtils.isBlank(inputDate)) {
+ return null;
+ }
+
+ try {
+ final LocalDate date = DateParserUtils
+ .parseDate(inputDate.trim())
+ .toInstant()
+ .atZone(ZoneId.systemDefault())
+ .toLocalDate();
+ return DateTimeFormatter.ofPattern(ModelSupport.DATE_FORMAT).format(date);
+ } catch (DateTimeParseException e) {
+ return null;
+ }
+ }
+
+ // HELPERS
+
+ private static boolean isValidAuthorName(Author a) {
+ return !Stream
+ .of(a.getFullname(), a.getName(), a.getSurname())
+ .filter(s -> s != null && !s.isEmpty())
+ .collect(Collectors.joining(""))
+ .toLowerCase()
+ .matches(INVALID_AUTHOR_REGEX);
+ }
+
+ private static List processPidCleaning(List pids) {
+ return pids
+ .stream()
+ .filter(Objects::nonNull)
+ .filter(sp -> StringUtils.isNotBlank(StringUtils.trim(sp.getValue())))
+ .filter(sp -> !PID_BLACKLIST.contains(sp.getValue().trim().toLowerCase()))
+ .filter(sp -> Objects.nonNull(sp.getQualifier()))
+ .filter(sp -> StringUtils.isNotBlank(sp.getQualifier().getClassid()))
+ .map(CleaningFunctions::normalizePidValue)
+ .filter(CleaningFunctions::pidFilter)
+ .collect(Collectors.toList());
+ }
+
+ private static void fixVocabName(Qualifier q, String vocabularyName) {
+ if (Objects.nonNull(q) && StringUtils.isBlank(q.getSchemeid())) {
+ q.setSchemeid(vocabularyName);
+ q.setSchemename(vocabularyName);
+ }
+ }
+
+ private static AccessRight accessRight(String classid, String classname, String scheme) {
+ return OafMapperUtils
+ .accessRight(
+ classid, classname, scheme, scheme);
+ }
+
+ private static Qualifier qualifier(String classid, String classname, String scheme) {
+ return OafMapperUtils
+ .qualifier(
+ classid, classname, scheme, scheme);
+ }
+
+ protected static StructuredProperty cleanValue(StructuredProperty s) {
+ s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
+ return s;
+ }
+
+ protected static Subject cleanValue(Subject s) {
+ s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
+ return s;
+ }
+
+ protected static Field cleanValue(Field s) {
+ s.setValue(s.getValue().replaceAll(CLEANING_REGEX, " "));
+ return s;
+ }
+
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
deleted file mode 100644
index 319cda0bf..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactory.java
+++ /dev/null
@@ -1,102 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.io.Serializable;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringUtils;
-
-import eu.dnetlib.dhp.schema.oaf.CleaningFunctions;
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-/**
- * Factory class for OpenAIRE identifiers in the Graph
- */
-public class IdentifierFactory implements Serializable {
-
- public static final String ID_SEPARATOR = "::";
- public static final String ID_PREFIX_SEPARATOR = "|";
- public final static String ID_REGEX = "^[0-9][0-9]\\" + ID_PREFIX_SEPARATOR + ".{12}" + ID_SEPARATOR
- + "[a-zA-Z0-9]{32}$";
-
- public final static String DOI_REGEX = "(^10\\.[0-9]{4,9}\\/[-._;()\\/:a-zA-Z0-9]+$)|" +
- "(^10\\.1002\\/[^\\s]+$)|" +
- "(^10\\.1021\\/[a-zA-Z0-9_][a-zA-Z0-9_][0-9]++$)|" +
- "(^10\\.1207\\/[a-zA-Z0-9_]+\\&[0-9]+_[0-9]+$)";
-
- public static final int ID_PREFIX_LEN = 12;
- public static final String NONE = "none";
-
- /**
- * Creates an identifier from the most relevant PID (if available) in the given entity T. Returns entity.id
- * when no PID is available
- * @param entity the entity providing PIDs and a default ID.
- * @param the specific entity type. Currently Organization and Result subclasses are supported.
- * @return an identifier from the most relevant PID, entity.id otherwise
- */
- public static String createIdentifier(T entity) {
-
- if (Objects.isNull(entity.getPid()) || entity.getPid().isEmpty()) {
- return entity.getId();
- }
-
- return entity
- .getPid()
- .stream()
- .filter(s -> pidFilter(s))
- .min(new PidComparator<>(entity))
- .map(s -> idFromPid(entity, s))
- .map(IdentifierFactory::verifyIdSyntax)
- .orElseGet(entity::getId);
- }
-
- protected static boolean pidFilter(StructuredProperty s) {
- if (Objects.isNull(s.getQualifier()) ||
- StringUtils.isBlank(StringUtils.trim(s.getValue()))) {
- return false;
- }
- try {
- switch (PidType.valueOf(s.getQualifier().getClassid())) {
- case doi:
- final String doi = StringUtils.trim(StringUtils.lowerCase(s.getValue()));
- return doi.matches(DOI_REGEX);
- default:
- return true;
- }
- } catch (IllegalArgumentException e) {
- return false;
- }
- }
-
- private static String verifyIdSyntax(String s) {
- if (StringUtils.isBlank(s) || !s.matches(ID_REGEX)) {
- throw new RuntimeException(String.format("malformed id: '%s'", s));
- } else {
- return s;
- }
- }
-
- private static String idFromPid(T entity, StructuredProperty s) {
- return new StringBuilder()
- .append(StringUtils.substringBefore(entity.getId(), ID_PREFIX_SEPARATOR))
- .append(ID_PREFIX_SEPARATOR)
- .append(createPrefix(s.getQualifier().getClassid()))
- .append(ID_SEPARATOR)
- .append(DHPUtils.md5(CleaningFunctions.normalizePidValue(s).getValue()))
- .toString();
- }
-
- // create the prefix (length = 12)
- private static String createPrefix(String pidType) {
- StringBuilder prefix = new StringBuilder(StringUtils.left(pidType, ID_PREFIX_LEN));
- while (prefix.length() < ID_PREFIX_LEN) {
- prefix.append("_");
- }
- return prefix.substring(0, ID_PREFIX_LEN);
- }
-
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
new file mode 100644
index 000000000..c58096d35
--- /dev/null
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
@@ -0,0 +1,517 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static eu.dnetlib.dhp.schema.common.ModelConstants.*;
+
+import java.sql.Array;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+
+import eu.dnetlib.dhp.schema.common.AccessRightComparator;
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.common.ModelSupport;
+import eu.dnetlib.dhp.schema.oaf.*;
+
+public class OafMapperUtils {
+
+ private OafMapperUtils() {
+ }
+
+ public static Oaf merge(final Oaf left, final Oaf right) {
+ if (ModelSupport.isSubClass(left, OafEntity.class)) {
+ return mergeEntities((OafEntity) left, (OafEntity) right);
+ } else if (ModelSupport.isSubClass(left, Relation.class)) {
+ ((Relation) left).mergeFrom((Relation) right);
+ } else {
+ throw new IllegalArgumentException("invalid Oaf type:" + left.getClass().getCanonicalName());
+ }
+ return left;
+ }
+
+ public static OafEntity mergeEntities(OafEntity left, OafEntity right) {
+ if (ModelSupport.isSubClass(left, Result.class)) {
+ return mergeResults((Result) left, (Result) right);
+ } else if (ModelSupport.isSubClass(left, Datasource.class)) {
+ left.mergeFrom(right);
+ } else if (ModelSupport.isSubClass(left, Organization.class)) {
+ left.mergeFrom(right);
+ } else if (ModelSupport.isSubClass(left, Project.class)) {
+ left.mergeFrom(right);
+ } else {
+ throw new IllegalArgumentException("invalid OafEntity subtype:" + left.getClass().getCanonicalName());
+ }
+ return left;
+ }
+
+ public static Result mergeResults(Result left, Result right) {
+
+ final boolean leftFromDelegatedAuthority = isFromDelegatedAuthority(left);
+ final boolean rightFromDelegatedAuthority = isFromDelegatedAuthority(right);
+
+ if (leftFromDelegatedAuthority && !rightFromDelegatedAuthority) {
+ return left;
+ }
+ if (!leftFromDelegatedAuthority && rightFromDelegatedAuthority) {
+ return right;
+ }
+
+ if (new ResultTypeComparator().compare(left, right) < 0) {
+ left.mergeFrom(right);
+ return left;
+ } else {
+ right.mergeFrom(left);
+ return right;
+ }
+ }
+
+ private static boolean isFromDelegatedAuthority(Result r) {
+ return Optional
+ .ofNullable(r.getInstance())
+ .map(
+ instance -> instance
+ .stream()
+ .filter(i -> Objects.nonNull(i.getCollectedfrom()))
+ .map(i -> i.getCollectedfrom().getKey())
+ .anyMatch(cfId -> IdentifierFactory.delegatedAuthorityDatasourceIds().contains(cfId)))
+ .orElse(false);
+ }
+
+ public static KeyValue keyValue(final String k, final String v) {
+ final KeyValue kv = new KeyValue();
+ kv.setKey(k);
+ kv.setValue(v);
+ return kv;
+ }
+
+ public static List listKeyValues(final String... s) {
+ if (s.length % 2 > 0) {
+ throw new IllegalArgumentException("Invalid number of parameters (k,v,k,v,....)");
+ }
+
+ final List list = new ArrayList<>();
+ for (int i = 0; i < s.length; i += 2) {
+ list.add(keyValue(s[i], s[i + 1]));
+ }
+ return list;
+ }
+
+ public static Field field(final T value, final DataInfo info) {
+ if (value == null || StringUtils.isBlank(value.toString())) {
+ return null;
+ }
+
+ final Field field = new Field<>();
+ field.setValue(value);
+ field.setDataInfo(info);
+ return field;
+ }
+
+ public static List> listFields(final DataInfo info, final String... values) {
+ return Arrays
+ .stream(values)
+ .map(v -> field(v, info))
+ .filter(Objects::nonNull)
+ .filter(distinctByKey(Field::getValue))
+ .collect(Collectors.toList());
+ }
+
+ public static List listValues(Array values) throws SQLException {
+ if (Objects.isNull(values)) {
+ return null;
+ }
+ return Arrays
+ .stream((T[]) values.getArray())
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ public static List> listFields(final DataInfo info, final List values) {
+ return values
+ .stream()
+ .map(v -> field(v, info))
+ .filter(Objects::nonNull)
+ .filter(distinctByKey(Field::getValue))
+ .collect(Collectors.toList());
+ }
+
+ public static Qualifier unknown(final String schemeid, final String schemename) {
+ return qualifier(UNKNOWN, "Unknown", schemeid, schemename);
+ }
+
+ public static AccessRight accessRight(
+ final String classid,
+ final String classname,
+ final String schemeid,
+ final String schemename) {
+ return accessRight(classid, classname, schemeid, schemename, null);
+ }
+
+ public static AccessRight accessRight(
+ final String classid,
+ final String classname,
+ final String schemeid,
+ final String schemename,
+ final OpenAccessRoute openAccessRoute) {
+ final AccessRight accessRight = new AccessRight();
+ accessRight.setClassid(classid);
+ accessRight.setClassname(classname);
+ accessRight.setSchemeid(schemeid);
+ accessRight.setSchemename(schemename);
+ accessRight.setOpenAccessRoute(openAccessRoute);
+ return accessRight;
+ }
+
+ public static Qualifier qualifier(
+ final String classid,
+ final String classname,
+ final String schemeid,
+ final String schemename) {
+ final Qualifier q = new Qualifier();
+ q.setClassid(classid);
+ q.setClassname(classname);
+ q.setSchemeid(schemeid);
+ q.setSchemename(schemename);
+ return q;
+ }
+
+ public static Qualifier qualifier(final Qualifier qualifier) {
+ final Qualifier q = new Qualifier();
+ q.setClassid(qualifier.getClassid());
+ q.setClassname(qualifier.getClassname());
+ q.setSchemeid(qualifier.getSchemeid());
+ q.setSchemename(qualifier.getSchemename());
+ return q;
+ }
+
+ public static Subject subject(
+ final String value,
+ final String classid,
+ final String classname,
+ final String schemeid,
+ final String schemename,
+ final DataInfo dataInfo) {
+
+ return subject(value, qualifier(classid, classname, schemeid, schemename), dataInfo);
+ }
+
+ public static StructuredProperty structuredProperty(
+ final String value,
+ final String classid,
+ final String classname,
+ final String schemeid,
+ final String schemename,
+ final DataInfo dataInfo) {
+
+ return structuredProperty(value, qualifier(classid, classname, schemeid, schemename), dataInfo);
+ }
+
+ public static Subject subject(
+ final String value,
+ final Qualifier qualifier,
+ final DataInfo dataInfo) {
+ if (value == null) {
+ return null;
+ }
+ final Subject s = new Subject();
+ s.setValue(value);
+ s.setQualifier(qualifier);
+ s.setDataInfo(dataInfo);
+ return s;
+ }
+
+ public static StructuredProperty structuredProperty(
+ final String value,
+ final Qualifier qualifier,
+ final DataInfo dataInfo) {
+ if (value == null) {
+ return null;
+ }
+ final StructuredProperty sp = new StructuredProperty();
+ sp.setValue(value);
+ sp.setQualifier(qualifier);
+ sp.setDataInfo(dataInfo);
+ return sp;
+ }
+
+ public static ExtraInfo extraInfo(
+ final String name,
+ final String value,
+ final String typology,
+ final String provenance,
+ final String trust) {
+ final ExtraInfo info = new ExtraInfo();
+ info.setName(name);
+ info.setValue(value);
+ info.setTypology(typology);
+ info.setProvenance(provenance);
+ info.setTrust(trust);
+ return info;
+ }
+
+ public static OAIProvenance oaiIProvenance(
+ final String identifier,
+ final String baseURL,
+ final String metadataNamespace,
+ final Boolean altered,
+ final String datestamp,
+ final String harvestDate) {
+
+ final OriginDescription desc = new OriginDescription();
+ desc.setIdentifier(identifier);
+ desc.setBaseURL(baseURL);
+ desc.setMetadataNamespace(metadataNamespace);
+ desc.setAltered(altered);
+ desc.setDatestamp(datestamp);
+ desc.setHarvestDate(harvestDate);
+
+ final OAIProvenance p = new OAIProvenance();
+ p.setOriginDescription(desc);
+
+ return p;
+ }
+
+ public static Journal journal(
+ final String name,
+ final String issnPrinted,
+ final String issnOnline,
+ final String issnLinking,
+ final DataInfo dataInfo) {
+
+ return hasIssn(issnPrinted, issnOnline, issnLinking) ? journal(
+ name,
+ issnPrinted,
+ issnOnline,
+ issnLinking,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ dataInfo) : null;
+ }
+
+ public static Journal journal(
+ final String name,
+ final String issnPrinted,
+ final String issnOnline,
+ final String issnLinking,
+ final String ep,
+ final String iss,
+ final String sp,
+ final String vol,
+ final String edition,
+ final String conferenceplace,
+ final String conferencedate,
+ final DataInfo dataInfo) {
+
+ if (StringUtils.isNotBlank(name) || hasIssn(issnPrinted, issnOnline, issnLinking)) {
+ final Journal j = new Journal();
+ j.setName(name);
+ j.setIssnPrinted(issnPrinted);
+ j.setIssnOnline(issnOnline);
+ j.setIssnLinking(issnLinking);
+ j.setEp(ep);
+ j.setIss(iss);
+ j.setSp(sp);
+ j.setVol(vol);
+ j.setEdition(edition);
+ j.setConferenceplace(conferenceplace);
+ j.setConferencedate(conferencedate);
+ j.setDataInfo(dataInfo);
+ return j;
+ } else {
+ return null;
+ }
+ }
+
+ private static boolean hasIssn(String issnPrinted, String issnOnline, String issnLinking) {
+ return StringUtils.isNotBlank(issnPrinted)
+ || StringUtils.isNotBlank(issnOnline)
+ || StringUtils.isNotBlank(issnLinking);
+ }
+
+ public static DataInfo dataInfo(
+ final Boolean deletedbyinference,
+ final String inferenceprovenance,
+ final Boolean inferred,
+ final Boolean invisible,
+ final Qualifier provenanceaction,
+ final String trust) {
+ final DataInfo d = new DataInfo();
+ d.setDeletedbyinference(deletedbyinference);
+ d.setInferenceprovenance(inferenceprovenance);
+ d.setInferred(inferred);
+ d.setInvisible(invisible);
+ d.setProvenanceaction(provenanceaction);
+ d.setTrust(trust);
+ return d;
+ }
+
+ public static String createOpenaireId(
+ final int prefix,
+ final String originalId,
+ final boolean to_md5) {
+ if (StringUtils.isBlank(originalId)) {
+ return null;
+ } else if (to_md5) {
+ final String nsPrefix = StringUtils.substringBefore(originalId, "::");
+ final String rest = StringUtils.substringAfter(originalId, "::");
+ return String.format("%s|%s::%s", prefix, nsPrefix, IdentifierFactory.md5(rest));
+ } else {
+ return String.format("%s|%s", prefix, originalId);
+ }
+ }
+
+ public static String createOpenaireId(
+ final String type,
+ final String originalId,
+ final boolean to_md5) {
+ switch (type) {
+ case "datasource":
+ return createOpenaireId(10, originalId, to_md5);
+ case "organization":
+ return createOpenaireId(20, originalId, to_md5);
+ case "person":
+ return createOpenaireId(30, originalId, to_md5);
+ case "project":
+ return createOpenaireId(40, originalId, to_md5);
+ default:
+ return createOpenaireId(50, originalId, to_md5);
+ }
+ }
+
+ public static String asString(final Object o) {
+ return o == null ? "" : o.toString();
+ }
+
+ public static Predicate distinctByKey(
+ final Function keyExtractor) {
+ final Map seen = new ConcurrentHashMap<>();
+ return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+ }
+
+ public static Qualifier createBestAccessRights(final List instanceList) {
+ return getBestAccessRights(instanceList);
+ }
+
+ protected static Qualifier getBestAccessRights(final List instanceList) {
+ if (instanceList != null) {
+ final Optional min = instanceList
+ .stream()
+ .map(Instance::getAccessright)
+ .min(new AccessRightComparator<>());
+
+ final Qualifier rights = min.map(OafMapperUtils::qualifier).orElseGet(Qualifier::new);
+
+ if (StringUtils.isBlank(rights.getClassid())) {
+ rights.setClassid(UNKNOWN);
+ }
+ if (StringUtils.isBlank(rights.getClassname())
+ || UNKNOWN.equalsIgnoreCase(rights.getClassname())) {
+ rights.setClassname(NOT_AVAILABLE);
+ }
+ if (StringUtils.isBlank(rights.getSchemeid())) {
+ rights.setSchemeid(DNET_ACCESS_MODES);
+ }
+ if (StringUtils.isBlank(rights.getSchemename())) {
+ rights.setSchemename(DNET_ACCESS_MODES);
+ }
+
+ return rights;
+ }
+ return null;
+ }
+
+ public static KeyValue newKeyValueInstance(String key, String value, DataInfo dataInfo) {
+ KeyValue kv = new KeyValue();
+ kv.setDataInfo(dataInfo);
+ kv.setKey(key);
+ kv.setValue(value);
+ return kv;
+ }
+
+ public static Measure newMeasureInstance(String id, String value, String key, DataInfo dataInfo) {
+ Measure m = new Measure();
+ m.setId(id);
+ m.setUnit(Arrays.asList(newKeyValueInstance(key, value, dataInfo)));
+ return m;
+ }
+
+ public static Relation getRelation(final String source,
+ final String target,
+ final String relType,
+ final String subRelType,
+ final String relClass,
+ final OafEntity entity) {
+ return getRelation(source, target, relType, subRelType, relClass, entity, null);
+ }
+
+ public static Relation getRelation(final String source,
+ final String target,
+ final String relType,
+ final String subRelType,
+ final String relClass,
+ final OafEntity entity,
+ final String validationDate) {
+ return getRelation(
+ source, target, relType, subRelType, relClass, entity.getCollectedfrom(), entity.getDataInfo(),
+ entity.getLastupdatetimestamp(), validationDate, null);
+ }
+
+ public static Relation getRelation(final String source,
+ final String target,
+ final String relType,
+ final String subRelType,
+ final String relClass,
+ final List collectedfrom,
+ final DataInfo dataInfo,
+ final Long lastupdatetimestamp) {
+ return getRelation(
+ source, target, relType, subRelType, relClass, collectedfrom, dataInfo, lastupdatetimestamp, null, null);
+ }
+
+ public static Relation getRelation(final String source,
+ final String target,
+ final String relType,
+ final String subRelType,
+ final String relClass,
+ final List collectedfrom,
+ final DataInfo dataInfo,
+ final Long lastupdatetimestamp,
+ final String validationDate,
+ final List properties) {
+ final Relation rel = new Relation();
+ rel.setRelType(relType);
+ rel.setSubRelType(subRelType);
+ rel.setRelClass(relClass);
+ rel.setSource(source);
+ rel.setTarget(target);
+ rel.setCollectedfrom(collectedfrom);
+ rel.setDataInfo(dataInfo);
+ rel.setLastupdatetimestamp(lastupdatetimestamp);
+ rel.setValidated(StringUtils.isNotBlank(validationDate));
+ rel.setValidationDate(StringUtils.isNotBlank(validationDate) ? validationDate : null);
+ rel.setProperties(properties);
+ return rel;
+ }
+
+ public static String getProvenance(DataInfo dataInfo) {
+ return Optional
+ .ofNullable(dataInfo)
+ .map(
+ d -> Optional
+ .ofNullable(d.getProvenanceaction())
+ .map(Qualifier::getClassid)
+ .orElse(""))
+ .orElse("");
+ }
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OrganizationPidComparator.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OrganizationPidComparator.java
deleted file mode 100644
index 733d41bff..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OrganizationPidComparator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.Comparator;
-
-public class OrganizationPidComparator implements Comparator {
-
- @Override
- public int compare(PidType pLeft, PidType pRight) {
- if (pLeft.equals(PidType.GRID))
- return -1;
- if (pRight.equals(PidType.GRID))
- return 1;
-
- if (pLeft.equals(PidType.mag_id))
- return -1;
- if (pRight.equals(PidType.mag_id))
- return 1;
-
- if (pLeft.equals(PidType.urn))
- return -1;
- if (pRight.equals(PidType.urn))
- return 1;
-
- return 0;
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidComparator.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidComparator.java
deleted file mode 100644
index 34ce5563f..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidComparator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.Comparator;
-
-import eu.dnetlib.dhp.schema.common.ModelSupport;
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-import eu.dnetlib.dhp.schema.oaf.Organization;
-import eu.dnetlib.dhp.schema.oaf.Result;
-import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
-
-public class PidComparator implements Comparator {
-
- private T entity;
-
- public PidComparator(T entity) {
- this.entity = entity;
- }
-
- @Override
- public int compare(StructuredProperty left, StructuredProperty right) {
-
- if (left == null && right == null)
- return 0;
- if (left == null)
- return 1;
- if (right == null)
- return -1;
-
- PidType lClass = PidType.valueOf(left.getQualifier().getClassid());
- PidType rClass = PidType.valueOf(right.getQualifier().getClassid());
-
- if (lClass.equals(rClass))
- return 0;
-
- if (ModelSupport.isSubClass(entity, Result.class)) {
- return compareResultPids(lClass, rClass);
- }
- if (ModelSupport.isSubClass(entity, Organization.class)) {
- return compareOrganizationtPids(lClass, rClass);
- }
-
- // Else (but unlikely), lexicographical ordering will do.
- return lClass.compareTo(rClass);
- }
-
- private int compareResultPids(PidType lClass, PidType rClass) {
- return new ResultPidComparator().compare(lClass, rClass);
- }
-
- private int compareOrganizationtPids(PidType lClass, PidType rClass) {
- return new OrganizationPidComparator().compare(lClass, rClass);
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java
deleted file mode 100644
index 9a0196ccc..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import org.apache.commons.lang3.EnumUtils;
-
-public enum PidType {
-
- // Result
- doi, pmid, pmc, handle, arXiv, NCID, GBIF, nct, pdb,
-
- // Organization
- GRID, mag_id, urn,
-
- // Used by dedup
- undefined, original;
-
- public static boolean isValid(String type) {
- return EnumUtils.isValidEnum(PidType.class, type);
- }
-
- public static PidType tryValueOf(String s) {
- try {
- return PidType.valueOf(s);
- } catch (Exception e) {
- return PidType.original;
- }
- }
-
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultPidComparator.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultPidComparator.java
deleted file mode 100644
index 0f65cca36..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/ResultPidComparator.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import java.util.Comparator;
-
-public class ResultPidComparator implements Comparator {
-
- @Override
- public int compare(PidType pLeft, PidType pRight) {
- if (pLeft.equals(PidType.doi))
- return -1;
- if (pRight.equals(PidType.doi))
- return 1;
-
- if (pLeft.equals(PidType.pmid))
- return -1;
- if (pRight.equals(PidType.pmid))
- return 1;
-
- if (pLeft.equals(PidType.pmc))
- return -1;
- if (pRight.equals(PidType.pmc))
- return 1;
-
- if (pLeft.equals(PidType.handle))
- return -1;
- if (pRight.equals(PidType.handle))
- return 1;
-
- if (pLeft.equals(PidType.arXiv))
- return -1;
- if (pRight.equals(PidType.arXiv))
- return 1;
-
- if (pLeft.equals(PidType.NCID))
- return -1;
- if (pRight.equals(PidType.NCID))
- return 1;
-
- if (pLeft.equals(PidType.GBIF))
- return -1;
- if (pRight.equals(PidType.GBIF))
- return 1;
-
- if (pLeft.equals(PidType.nct))
- return -1;
- if (pRight.equals(PidType.nct))
- return 1;
-
- if (pLeft.equals(PidType.urn))
- return -1;
- if (pRight.equals(PidType.urn))
- return 1;
-
- return 0;
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/SubjectProvenanceComparator.java b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/SubjectProvenanceComparator.java
new file mode 100644
index 000000000..f4e3c8841
--- /dev/null
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/SubjectProvenanceComparator.java
@@ -0,0 +1,46 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static eu.dnetlib.dhp.schema.oaf.utils.OafMapperUtils.getProvenance;
+import static org.apache.commons.lang3.StringUtils.isBlank;
+
+import java.util.Comparator;
+
+import eu.dnetlib.dhp.schema.oaf.Subject;
+
+public class SubjectProvenanceComparator implements Comparator {
+
+ @Override
+ public int compare(Subject left, Subject right) {
+
+ String lProv = getProvenance(left.getDataInfo());
+ String rProv = getProvenance(right.getDataInfo());
+
+ if (isBlank(lProv) && isBlank(rProv))
+ return 0;
+ if (isBlank(lProv))
+ return 1;
+ if (isBlank(rProv))
+ return -1;
+ if (lProv.equals(rProv))
+ return 0;
+ if (lProv.toLowerCase().contains("crosswalk"))
+ return -1;
+ if (rProv.toLowerCase().contains("crosswalk"))
+ return 1;
+ if (lProv.toLowerCase().contains("user"))
+ return -1;
+ if (rProv.toLowerCase().contains("user"))
+ return 1;
+ if (lProv.toLowerCase().contains("propagation"))
+ return -1;
+ if (rProv.toLowerCase().contains("propagation"))
+ return 1;
+ if (lProv.toLowerCase().contains("iis"))
+ return -1;
+ if (rProv.toLowerCase().contains("iis"))
+ return 1;
+
+ return 0;
+ }
+}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java
index dfbaf3a6c..e10d0c500 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/DHPUtils.java
@@ -1,63 +1,112 @@
package eu.dnetlib.dhp.utils;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.io.*;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
+import java.util.*;
+import java.util.stream.Collectors;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.codec.binary.Base64OutputStream;
import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.SaveMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Maps;
import com.jayway.jsonpath.JsonPath;
+import eu.dnetlib.dhp.schema.mdstore.MDStoreWithInfo;
+import eu.dnetlib.dhp.schema.oaf.utils.CleaningFunctions;
import net.minidev.json.JSONArray;
+import scala.collection.JavaConverters;
+import scala.collection.Seq;
public class DHPUtils {
+ private static final Logger log = LoggerFactory.getLogger(DHPUtils.class);
+
+ private DHPUtils() {
+ }
+
+ public static Seq toSeq(List list) {
+ return JavaConverters.asScalaIteratorConverter(list.iterator()).asScala().toSeq();
+ }
+
public static String md5(final String s) {
try {
final MessageDigest md = MessageDigest.getInstance("MD5");
md.update(s.getBytes(StandardCharsets.UTF_8));
return new String(Hex.encodeHex(md.digest()));
} catch (final Exception e) {
- System.err.println("Error creating id");
+ log.error("Error creating id from {}", s);
return null;
}
}
+ /**
+ * Retrieves from the metadata store manager application the list of paths associated with mdstores characterized
+ * by he given format, layout, interpretation
+ * @param mdstoreManagerUrl the URL of the mdstore manager service
+ * @param format the mdstore format
+ * @param layout the mdstore layout
+ * @param interpretation the mdstore interpretation
+ * @param includeEmpty include Empty mdstores
+ * @return the set of hdfs paths
+ * @throws IOException in case of HTTP communication issues
+ */
+ public static Set mdstorePaths(final String mdstoreManagerUrl,
+ final String format,
+ final String layout,
+ final String interpretation,
+ boolean includeEmpty) throws IOException {
+ final String url = mdstoreManagerUrl + "/mdstores/";
+ final ObjectMapper objectMapper = new ObjectMapper();
+
+ final HttpGet req = new HttpGet(url);
+
+ log.info("MDStoreManager request: {}", req);
+
+ try (final CloseableHttpClient client = HttpClients.createDefault()) {
+ try (final CloseableHttpResponse response = client.execute(req)) {
+ final String json = IOUtils.toString(response.getEntity().getContent());
+
+ log.info("MDStoreManager response: {}", json);
+
+ final MDStoreWithInfo[] mdstores = objectMapper.readValue(json, MDStoreWithInfo[].class);
+ return Arrays
+ .stream(mdstores)
+ .filter(md -> md.getFormat().equalsIgnoreCase(format))
+ .filter(md -> md.getLayout().equalsIgnoreCase(layout))
+ .filter(md -> md.getInterpretation().equalsIgnoreCase(interpretation))
+ .filter(md -> StringUtils.isNotBlank(md.getHdfsPath()))
+ .filter(md -> StringUtils.isNotBlank(md.getCurrentVersion()))
+ .filter(md -> includeEmpty || md.getSize() > 0)
+ .map(md -> md.getHdfsPath() + "/" + md.getCurrentVersion() + "/store")
+ .collect(Collectors.toSet());
+ }
+ }
+ }
+
public static String generateIdentifier(final String originalId, final String nsPrefix) {
return String.format("%s::%s", nsPrefix, DHPUtils.md5(originalId));
}
- public static String compressString(final String input) {
- try (ByteArrayOutputStream out = new ByteArrayOutputStream();
- Base64OutputStream b64os = new Base64OutputStream(out)) {
- GZIPOutputStream gzip = new GZIPOutputStream(b64os);
- gzip.write(input.getBytes(StandardCharsets.UTF_8));
- gzip.close();
- return out.toString();
- } catch (Throwable e) {
- return null;
- }
- }
+ public static String generateUnresolvedIdentifier(final String pid, final String pidType) {
- public static String decompressString(final String input) {
- byte[] byteArray = Base64.decodeBase64(input.getBytes());
- int len;
- try (GZIPInputStream gis = new GZIPInputStream(new ByteArrayInputStream((byteArray)));
- ByteArrayOutputStream bos = new ByteArrayOutputStream(byteArray.length)) {
- byte[] buffer = new byte[1024];
- while ((len = gis.read(buffer)) != -1) {
- bos.write(buffer, 0, len);
- }
- return bos.toString();
- } catch (Exception e) {
- return null;
- }
+ final String cleanedPid = CleaningFunctions.normalizePidValue(pidType, pid);
+
+ return String.format("unresolved::%s::%s", cleanedPid, pidType.toLowerCase().trim());
}
public static String getJPathString(final String jsonPath, final String json) {
@@ -72,4 +121,72 @@ public class DHPUtils {
return "";
}
}
+
+ public static final ObjectMapper MAPPER = new ObjectMapper();
+
+ public static void writeHdfsFile(final Configuration conf, final String content, final String path)
+ throws IOException {
+
+ log.info("writing file {}, size {}", path, content.length());
+ try (FileSystem fs = FileSystem.get(conf);
+ BufferedOutputStream os = new BufferedOutputStream(fs.create(new Path(path)))) {
+ os.write(content.getBytes(StandardCharsets.UTF_8));
+ os.flush();
+ }
+ }
+
+ public static String readHdfsFile(Configuration conf, String path) throws IOException {
+ log.info("reading file {}", path);
+
+ try (FileSystem fs = FileSystem.get(conf)) {
+ final Path p = new Path(path);
+ if (!fs.exists(p)) {
+ throw new FileNotFoundException(path);
+ }
+ return IOUtils.toString(fs.open(p));
+ }
+ }
+
+ public static T readHdfsFileAs(Configuration conf, String path, Class clazz) throws IOException {
+ return MAPPER.readValue(readHdfsFile(conf, path), clazz);
+ }
+
+ public static void saveDataset(final Dataset mdstore, final String targetPath) {
+ log.info("saving dataset in: {}", targetPath);
+ mdstore
+ .write()
+ .mode(SaveMode.Overwrite)
+ .format("parquet")
+ .save(targetPath);
+ }
+
+ public static Configuration getHadoopConfiguration(String nameNode) {
+ // ====== Init HDFS File System Object
+ Configuration conf = new Configuration();
+ // Set FileSystem URI
+ conf.set("fs.defaultFS", nameNode);
+ // Because of Maven
+ conf.set("fs.hdfs.impl", org.apache.hadoop.hdfs.DistributedFileSystem.class.getName());
+ conf.set("fs.file.impl", org.apache.hadoop.fs.LocalFileSystem.class.getName());
+
+ System.setProperty("hadoop.home.dir", "/");
+ return conf;
+ }
+
+ public static void populateOOZIEEnv(final Map report) throws IOException {
+ File file = new File(System.getProperty("oozie.action.output.properties"));
+ Properties props = new Properties();
+ report.forEach((k, v) -> props.setProperty(k, v));
+
+ try (OutputStream os = new FileOutputStream(file)) {
+ props.store(os, "");
+ }
+ }
+
+ public static void populateOOZIEEnv(final String paramName, String value) throws IOException {
+ Map report = Maps.newHashMap();
+ report.put(paramName, value);
+
+ populateOOZIEEnv(report);
+ }
}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java
index 9552eb2b3..8ae0bb5c3 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java
@@ -1,11 +1,11 @@
package eu.dnetlib.dhp.utils;
-import java.util.Map;
-
-import javax.xml.ws.BindingProvider;
-
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,8 +15,11 @@ public class ISLookupClientFactory {
private static final Logger log = LoggerFactory.getLogger(ISLookupClientFactory.class);
- private static int requestTimeout = 60000 * 10;
- private static int connectTimeout = 60000 * 10;
+ private static final int requestTimeout = 60000 * 10;
+ private static final int connectTimeout = 60000 * 10;
+
+ private ISLookupClientFactory() {
+ }
public static ISLookUpService getLookUpService(final String isLookupUrl) {
return getServiceStub(ISLookUpService.class, isLookupUrl);
@@ -24,27 +27,28 @@ public class ISLookupClientFactory {
@SuppressWarnings("unchecked")
private static T getServiceStub(final Class clazz, final String endpoint) {
- log.info(String.format("creating %s stub from %s", clazz.getName(), endpoint));
+ log.info("creating {} stub from {}", clazz.getName(), endpoint);
final JaxWsProxyFactoryBean jaxWsProxyFactory = new JaxWsProxyFactoryBean();
jaxWsProxyFactory.setServiceClass(clazz);
jaxWsProxyFactory.setAddress(endpoint);
final T service = (T) jaxWsProxyFactory.create();
- if (service instanceof BindingProvider) {
+ Client client = ClientProxy.getClient(service);
+ if (client != null) {
+ HTTPConduit conduit = (HTTPConduit) client.getConduit();
+ HTTPClientPolicy policy = new HTTPClientPolicy();
+
log
.info(
- "setting timeouts for {} to requestTimeout: {}, connectTimeout: {}",
- BindingProvider.class.getName(), requestTimeout, connectTimeout);
+ "setting connectTimeout to {}, requestTimeout to {} for service {}",
+ connectTimeout,
+ requestTimeout,
+ clazz.getCanonicalName());
- Map requestContext = ((BindingProvider) service).getRequestContext();
-
- requestContext.put("com.sun.xml.internal.ws.request.timeout", requestTimeout);
- requestContext.put("com.sun.xml.internal.ws.connect.timeout", connectTimeout);
- requestContext.put("com.sun.xml.ws.request.timeout", requestTimeout);
- requestContext.put("com.sun.xml.ws.connect.timeout", connectTimeout);
- requestContext.put("javax.xml.ws.client.receiveTimeout", requestTimeout);
- requestContext.put("javax.xml.ws.client.connectionTimeout", connectTimeout);
+ policy.setConnectionTimeout(connectTimeout);
+ policy.setReceiveTimeout(requestTimeout);
+ conduit.setClient(policy);
}
return service;
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java
index 9b00b908c..81f1b5142 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java
@@ -10,7 +10,7 @@ import net.sf.saxon.trans.XPathException;
public abstract class AbstractExtensionFunction extends ExtensionFunctionDefinition {
- public static String DEFAULT_SAXON_EXT_NS_URI = "http://www.d-net.research-infrastructures.eu/saxon-extension";
+ public static final String DEFAULT_SAXON_EXT_NS_URI = "http://www.d-net.research-infrastructures.eu/saxon-extension";
public abstract String getName();
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java
index c7e311b02..1ea2b9f46 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java
@@ -26,7 +26,7 @@ public class ExtractYear extends AbstractExtensionFunction {
@Override
public Sequence doCall(XPathContext context, Sequence[] arguments) throws XPathException {
- if (arguments == null | arguments.length == 0) {
+ if (arguments == null || arguments.length == 0) {
return new StringValue("");
}
final Item item = arguments[0].head();
@@ -63,8 +63,7 @@ public class ExtractYear extends AbstractExtensionFunction {
for (String format : dateFormats) {
try {
c.setTime(new SimpleDateFormat(format).parse(s));
- String year = String.valueOf(c.get(Calendar.YEAR));
- return year;
+ return String.valueOf(c.get(Calendar.YEAR));
} catch (ParseException e) {
}
}
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java
index 1b5f3c40d..3e5def9b5 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java
@@ -30,7 +30,7 @@ public class NormalizeDate extends AbstractExtensionFunction {
@Override
public Sequence doCall(XPathContext context, Sequence[] arguments) throws XPathException {
- if (arguments == null | arguments.length == 0) {
+ if (arguments == null || arguments.length == 0) {
return new StringValue(BLANK);
}
String s = arguments[0].head().getStringValue();
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/PickFirst.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/PickFirst.java
index 46ecafd0a..b46a415d8 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/PickFirst.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/PickFirst.java
@@ -1,6 +1,8 @@
package eu.dnetlib.dhp.utils.saxon;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
import org.apache.commons.lang3.StringUtils;
import net.sf.saxon.expr.XPathContext;
@@ -26,7 +28,8 @@ public class PickFirst extends AbstractExtensionFunction {
final String s1 = getValue(arguments[0]);
final String s2 = getValue(arguments[1]);
- return new StringValue(StringUtils.isNotBlank(s1) ? s1 : StringUtils.isNotBlank(s2) ? s2 : "");
+ final String value = isNotBlank(s1) ? s1 : isNotBlank(s2) ? s2 : "";
+ return new StringValue(value);
}
private String getValue(final Sequence arg) throws XPathException {
diff --git a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java
index b85d866f1..61049d2e1 100644
--- a/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java
+++ b/dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java
@@ -12,6 +12,9 @@ import net.sf.saxon.TransformerFactoryImpl;
public class SaxonTransformerFactory {
+ private SaxonTransformerFactory() {
+ }
+
/**
* Creates the index record transformer from the given XSLT
*
diff --git a/dhp-common/src/main/java/eu/dnetlib/message/Message.java b/dhp-common/src/main/java/eu/dnetlib/message/Message.java
deleted file mode 100644
index fc1c38291..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/message/Message.java
+++ /dev/null
@@ -1,76 +0,0 @@
-
-package eu.dnetlib.message;
-
-import java.io.IOException;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-public class Message {
-
- private String workflowId;
-
- private String jobName;
-
- private MessageType type;
-
- private Map body;
-
- public static Message fromJson(final String json) throws IOException {
- final ObjectMapper jsonMapper = new ObjectMapper();
- return jsonMapper.readValue(json, Message.class);
- }
-
- public Message() {
- }
-
- public Message(String workflowId, String jobName, MessageType type, Map body) {
- this.workflowId = workflowId;
- this.jobName = jobName;
- this.type = type;
- this.body = body;
- }
-
- public String getWorkflowId() {
- return workflowId;
- }
-
- public void setWorkflowId(String workflowId) {
- this.workflowId = workflowId;
- }
-
- public String getJobName() {
- return jobName;
- }
-
- public void setJobName(String jobName) {
- this.jobName = jobName;
- }
-
- public MessageType getType() {
- return type;
- }
-
- public void setType(MessageType type) {
- this.type = type;
- }
-
- public Map getBody() {
- return body;
- }
-
- public void setBody(Map body) {
- this.body = body;
- }
-
- @Override
- public String toString() {
- final ObjectMapper jsonMapper = new ObjectMapper();
- try {
- return jsonMapper.writeValueAsString(this);
- } catch (JsonProcessingException e) {
- return null;
- }
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/message/MessageConsumer.java b/dhp-common/src/main/java/eu/dnetlib/message/MessageConsumer.java
deleted file mode 100644
index fb3f0bd95..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/message/MessageConsumer.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package eu.dnetlib.message;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import com.rabbitmq.client.AMQP;
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.DefaultConsumer;
-import com.rabbitmq.client.Envelope;
-
-public class MessageConsumer extends DefaultConsumer {
-
- final LinkedBlockingQueue queueMessages;
-
- /**
- * Constructs a new instance and records its association to the passed-in channel.
- *
- * @param channel the channel to which this consumer is attached
- * @param queueMessages
- */
- public MessageConsumer(Channel channel, LinkedBlockingQueue queueMessages) {
- super(channel);
- this.queueMessages = queueMessages;
- }
-
- @Override
- public void handleDelivery(
- String consumerTag, Envelope envelope, AMQP.BasicProperties properties, byte[] body)
- throws IOException {
- final String json = new String(body, StandardCharsets.UTF_8);
- Message message = Message.fromJson(json);
- try {
- this.queueMessages.put(message);
- System.out.println("Receiving Message " + message);
- } catch (InterruptedException e) {
- if (message.getType() == MessageType.REPORT)
- throw new RuntimeException("Error on sending message");
- else {
- // TODO LOGGING EXCEPTION
- }
- } finally {
- getChannel().basicAck(envelope.getDeliveryTag(), false);
- }
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java b/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java
deleted file mode 100644
index 5ca79f3cc..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/message/MessageManager.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package eu.dnetlib.message;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeoutException;
-
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-
-public class MessageManager {
-
- private final String messageHost;
-
- private final String username;
-
- private final String password;
-
- private Connection connection;
-
- private final Map channels = new HashMap<>();
-
- private boolean durable;
-
- private boolean autodelete;
-
- private final LinkedBlockingQueue queueMessages;
-
- public MessageManager(
- String messageHost,
- String username,
- String password,
- final LinkedBlockingQueue queueMessages) {
- this.queueMessages = queueMessages;
- this.messageHost = messageHost;
- this.username = username;
- this.password = password;
- }
-
- public MessageManager(
- String messageHost,
- String username,
- String password,
- boolean durable,
- boolean autodelete,
- final LinkedBlockingQueue queueMessages) {
- this.queueMessages = queueMessages;
- this.messageHost = messageHost;
- this.username = username;
- this.password = password;
-
- this.durable = durable;
- this.autodelete = autodelete;
- }
-
- private Connection createConnection() throws IOException, TimeoutException {
- ConnectionFactory factory = new ConnectionFactory();
- factory.setHost(this.messageHost);
- factory.setUsername(this.username);
- factory.setPassword(this.password);
- return factory.newConnection();
- }
-
- private Channel createChannel(
- final Connection connection,
- final String queueName,
- final boolean durable,
- final boolean autodelete)
- throws Exception {
- Map args = new HashMap<>();
- args.put("x-message-ttl", 10000);
- Channel channel = connection.createChannel();
- channel.queueDeclare(queueName, durable, false, this.autodelete, args);
- return channel;
- }
-
- private Channel getOrCreateChannel(final String queueName, boolean durable, boolean autodelete)
- throws Exception {
- if (channels.containsKey(queueName)) {
- return channels.get(queueName);
- }
-
- if (this.connection == null) {
- this.connection = createConnection();
- }
- channels.put(queueName, createChannel(this.connection, queueName, durable, autodelete));
- return channels.get(queueName);
- }
-
- public void close() throws IOException {
- channels
- .values()
- .forEach(
- ch -> {
- try {
- ch.close();
- } catch (Exception e) {
- // TODO LOG
- }
- });
-
- this.connection.close();
- }
-
- public boolean sendMessage(final Message message, String queueName) throws Exception {
- try {
- Channel channel = getOrCreateChannel(queueName, this.durable, this.autodelete);
- channel.basicPublish("", queueName, null, message.toString().getBytes());
- return true;
- } catch (Throwable e) {
- throw new RuntimeException(e);
- }
- }
-
- public boolean sendMessage(
- final Message message, String queueName, boolean durable_var, boolean autodelete_var)
- throws Exception {
- try {
- Channel channel = getOrCreateChannel(queueName, durable_var, autodelete_var);
- channel.basicPublish("", queueName, null, message.toString().getBytes());
- return true;
- } catch (Throwable e) {
- throw new RuntimeException(e);
- }
- }
-
- public void startConsumingMessage(
- final String queueName, final boolean durable, final boolean autodelete) throws Exception {
-
- Channel channel = createChannel(createConnection(), queueName, durable, autodelete);
- channel.basicConsume(queueName, false, new MessageConsumer(channel, queueMessages));
- }
-}
diff --git a/dhp-common/src/main/java/eu/dnetlib/message/MessageType.java b/dhp-common/src/main/java/eu/dnetlib/message/MessageType.java
deleted file mode 100644
index 72cbda252..000000000
--- a/dhp-common/src/main/java/eu/dnetlib/message/MessageType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-
-package eu.dnetlib.message;
-
-public enum MessageType {
- ONGOING, REPORT
-}
diff --git a/dhp-common/src/main/resources/eu/dnetlib/dhp/common/input_maketar_parameters.json b/dhp-common/src/main/resources/eu/dnetlib/dhp/common/input_maketar_parameters.json
new file mode 100644
index 000000000..a15318865
--- /dev/null
+++ b/dhp-common/src/main/resources/eu/dnetlib/dhp/common/input_maketar_parameters.json
@@ -0,0 +1,30 @@
+[
+
+ {
+ "paramName":"s",
+ "paramLongName":"sourcePath",
+ "paramDescription": "the path of the sequencial file to read",
+ "paramRequired": true
+ },
+ {
+ "paramName": "hdp",
+ "paramLongName": "hdfsPath",
+ "paramDescription": "the path used to store the output archive",
+ "paramRequired": true
+ },
+ {
+ "paramName":"nn",
+ "paramLongName":"nameNode",
+ "paramDescription": "the name node",
+ "paramRequired": true
+ },
+ {
+ "paramName":"ss",
+ "paramLongName":"splitSize",
+ "paramDescription": "the maximum size of the archive",
+ "paramRequired": false
+ }
+]
+
+
+
diff --git a/dhp-common/src/main/resources/eu/dnetlib/dhp/common/name_particles.txt b/dhp-common/src/main/resources/eu/dnetlib/dhp/common/name_particles.txt
new file mode 100644
index 000000000..07cf06a98
--- /dev/null
+++ b/dhp-common/src/main/resources/eu/dnetlib/dhp/common/name_particles.txt
@@ -0,0 +1,8 @@
+van
+von
+der
+de
+dell
+sig
+mr
+mrs
\ No newline at end of file
diff --git a/dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/dispatch_entities_parameters.json b/dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/dispatch_entities_parameters.json
new file mode 100644
index 000000000..aa8d2a7c2
--- /dev/null
+++ b/dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/dispatch_entities_parameters.json
@@ -0,0 +1,26 @@
+[
+ {
+ "paramName": "issm",
+ "paramLongName": "isSparkSessionManaged",
+ "paramDescription": "when true will stop SparkSession after job execution",
+ "paramRequired": false
+ },
+ {
+ "paramName": "i",
+ "paramLongName": "inputPath",
+ "paramDescription": "the source path",
+ "paramRequired": true
+ },
+ {
+ "paramName": "o",
+ "paramLongName": "outputPath",
+ "paramDescription": "path of the output graph",
+ "paramRequired": true
+ },
+ {
+ "paramName": "c",
+ "paramLongName": "graphTableClassName",
+ "paramDescription": "the graph entity class name",
+ "paramRequired": true
+ }
+]
\ No newline at end of file
diff --git a/dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/group_graph_entities_parameters.json b/dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/group_graph_entities_parameters.json
new file mode 100644
index 000000000..e65acb3c4
--- /dev/null
+++ b/dhp-common/src/main/resources/eu/dnetlib/dhp/oa/merge/group_graph_entities_parameters.json
@@ -0,0 +1,20 @@
+[
+ {
+ "paramName": "issm",
+ "paramLongName": "isSparkSessionManaged",
+ "paramDescription": "when true will stop SparkSession after job execution",
+ "paramRequired": false
+ },
+ {
+ "paramName": "gin",
+ "paramLongName": "graphInputPath",
+ "paramDescription": "the graph root path",
+ "paramRequired": true
+ },
+ {
+ "paramName": "out",
+ "paramLongName": "outputPath",
+ "paramDescription": "the output merged graph root path",
+ "paramRequired": true
+ }
+]
\ No newline at end of file
diff --git a/dhp-common/src/main/resources/eu/dnetlib/dhp/schema/oaf/utils/pid_blacklist.json b/dhp-common/src/main/resources/eu/dnetlib/dhp/schema/oaf/utils/pid_blacklist.json
new file mode 100644
index 000000000..05e8cde72
--- /dev/null
+++ b/dhp-common/src/main/resources/eu/dnetlib/dhp/schema/oaf/utils/pid_blacklist.json
@@ -0,0 +1,5 @@
+{
+ "doi" : [ "10.12739/10.12739", "10.11646/zootaxa.4404.1.1", "10.5281/zenodo.3678492", "10.11646/zootaxa.4757.1.1", "10.17176/20170811-142447", "10.6035/asparkia", "10.11646/zootaxa.4754.1.6", "10.11646/zootaxa.4784.1.1", "10.6035/millars", "10.11646/zootaxa.4776.1.1", "10.1590/1982-0224-20170094", "10.11646/zootaxa.4773.1.1", "10.11646/zootaxa.4744.1.1", "10.3897/zookeys.38.383", "10.1371/journal.", "10.5281/zenodo.3727017", "10.5252/zoosystema2019v41a15", "10.6035/dossiersf", "10.11646/zootaxa.4754.1.20", "10.6035/recerca", "10.11646/zootaxa.4428.1.1", "10.7179/psri", "10.11646/zootaxa.4785.1.1", "10.2478/aemnp-2018-0014", "10.17979/spudc.9788497497565", "10.2139/ssrn.2721313", "10.17979/spudc.9788497497749", "10.5281/zenodo.3760976", "10.11646/zootaxa.4381.1.1", "10.6035/tiempos", "10.11646/zootaxa.4754.1.10", "10.5281/zenodo.3776452", "10.11646/zootaxa.4754.1.16", "10.5252/zoosystema2019v41a26", "10.11646/zootaxa.4759.2.1", "10.11646/zootaxa.4741.1.1", "10.5252/zoosystema2019v41a4", "10.1145/nnnnnnn.nnnnnnn", "10.17979/spudc.9788497497169", "10.11646/zootaxa.4780.3.1", "10.11646/zootaxa.4663.1.1", "10.5281/zenodo.3748525", "10.5281/zenodo.3746744", "10.3920/978-90-8686-761-5", "10.14198/eurau18alicante", "10.5252/geodiversitas2019v41a8", "10.4126/38m-0000003", "10.5281/zenodo.3648511", "10.6035/clr", "10.4126/38m-0000004", "10.5281/zenodo.3732535", "10.5281/zenodo.3355776", "10.4126/38m-0000002", "10.11646/zootaxa.4763.3.3", "10.11646/zootaxa.4413.3.1", "10.1163/9789004416208_005", "10.4126/38m-0000001", "10.3897/zookeys.30.308", "10.4126/38m-0000000", "10.5281/zenodo.3739808", "10.5281/zenodo.3674873", "10.3161/00034541anz2020.70.1.003", "10.5281/zenodo.3738648", "10.11646/zootaxa.4765.1.1", "10.11646/zootaxa.4754.1.8", "10.3897/zookeys.36.306", "10.4230/lipics", "10.5281/zenodo.3758345", "10.3161/00034541anz2020.70.1.001", "10.3929/ethz-a-005427569", "10.11646/zootaxa.4772.1.1", "10.5281/zenodo.3677235", "10.11646/zootaxa.4766.1.1", "10.17509/jurnal", "10.1145/1235", "10.11646/zootaxa.4754.1.15", "10.2478/aemnp-2018-0018", "10.11646/zootaxa.4538.1.1", "10.11646/zootaxa.4740.1.1", "10.3897/zookeys.32.282", "10.3897/zookeys.2.56", "10.3897/zookeys.39.425", "10.11646/zootaxa.4514.3.3", "10.1007/978-94-007-1966-8", "10.3897/zookeys.26.214", "10.11646/zootaxa.4106.1.1", "10.3897/zookeys.22.219", "10.11646/zootaxa.4748.2.1", "10.5252/zoosystema2019v41a19", "10.3897/zookeys.22.122", "10.1080/00222933.2019.1634225", "10.11646/zootaxa.4632.1.1", "10.1007/s00259-016-3484-4", "10.3897/zookeys.19.221", "10.3897/zookeys.2.7", "10.11646/zootaxa.4777.1.1", "10.14279/depositonce-3753", "10.1111/apha.12712", "10.11646/zootaxa.4759.3.4", "10.11646/zootaxa.4754.1.9", "10.11646/zootaxa.4747.2.8", "10.5281/zenodo.3757451", "10.5281/zenodo.3740269", "10.5252/zoosystema2020v42a4", "10.1140/epje/i2013-13103-3", "10.1177/0301006619863862", "10.5281/zenodo.3726987", "10.12795/hid", "10.24042/jipf", "10.12795/e-rips", "10.1186/s12913-016-1423-5", "10.4126/38m-0000005", "10.3847/2041-8213/aa91c9", "10.1145/1122445.1122456", "10.1103/physrevlett.114.191803", "10.3920/978-90-8686-782-0", "10.11646/zootaxa.4739.1.1", "10.11646/zootaxa.4770.1.1", "10.21009/10.21009/jpd.081", "10.1080/15548627.2015.1100356", "10.12795/ricl", "10.3897/zookeys.34.309", "10.1080/00222933.2019.1692088", "10.4126/frl01-0064002", "10.1371/journal", "10.1175/1520-0485(2002)032", "10.3897/zookeys.22.152", "10.11646/zootaxa.4731.2.1", "10.4126/frl01-0064005", "10.11646/zootaxa.4738.1.1", "10.11646/zootaxa.4780.1.6", "10.4126/frl01-0064004", "10.6018/analesps.31.1.158071", "10.1007/jhep08(2016)045", "10.5281/zenodo.3759519", "10.4126/frl01-0064010", "10.11646/zootaxa.4537.1.1", "10.5281/zenodo.3713533", "10.5281/zenodo.3742020", "10.4126/frl01-0064014", "10.4126/frl01-0064001", "10.1000/isbn", "10.5281/zenodo.3777290", "10.4126/frl01-0064008", "10.1159/000440895", "10.3897/zookeys.31.140", "10.4126/frl01-0064003", "10.1080/00222933.2018.1524032", "10.21686/2500-3925-2014-6", "10.1016/j.bbr.2011.03.031", "10.4126/frl01-0064006", "10.4126/frl01-0064007", "10.4126/frl01-0064020", "10.4126/frl01-0064016", "10.2478/aemnp-2018-0013", "10.4126/frl01-0064021", "10.5281/zenodo.3754300", "10.15330/gal.29-30.", "10.3897/zookeys.2.4", "10.5252/zoosystema2019v41a7", "10.22435/bpk.v17i2", "10.4126/frl01-0063997", "10.3897/zookeys.11.160", "10.11646/zootaxa.4754.1.14", "10.4126/frl01-0064013", "10.1080/20013078.2018.1535750", "10.1016/j.", "10.4126/frl01-0064011", "10.1002/ece3.2579", "10.1088/0264-9381/28/9/094001", "10.3897/zookeys.2.25", "10.4126/frl01-0064019", "10.4126/frl01-0063994", "10.4126/frl01-0064135", "10.4126/frl01-0063998", "10.12795/ppa", "10.4126/frl01-0064009", "10.11646/zootaxa.4769.1.1", "10.11646/zootaxa.4419.1.1", "10.11646/zootaxa.4733.1.1", "10.4126/frl01-0063993", "10.3161/15081109acc2016.18.1.005", "10.11646/zootaxa.4763.1.2", "10.11646/zootaxa.4754.1.19", "10.4126/frl01-0064136", "10.4126/frl01-0064159", "10.4126/frl01-0063999", "10.4126/frl01-0064161", "10.1089/ten.tea.2015.5000.abstracts", "10.1002/(issn)1521-3773", "10.1140/epjc/s10052-015-3325-9", "10.1016/j.physletb.2016.04.050", "10.1007/jhep04(2015)117", "10.1111/gcb.14904", "10.1016/s0140-6736(17)32129-3", "10.11646/zootaxa.4748.1.1", "10.4126/frl01-0064078", "10.1140/epjc/s10052-015-3408-7", "10.1002/(issn)1097-4652", "10.1007/jhep06(2015)121", "10.1007/jhep09(2014)103", "10.1016/j.gca.2007.06.021", "10.1007/jhep09(2015)049", "10.3897/zookeys.4.32", "10.6101/azq/0002", "10.11646/zootaxa.4764.1.1", "10.11646/zootaxa.4772.1.5", "10.4126/frl01-0064000", "10.4126/frl01-0064131", "10.1016/j.physletb.2015.08.061", "10.1007/jhep01(2015)069", "10.1016/j.physletb.2016.06.039", "10.1016/j.physletb.2015.07.011", "10.1007/jhep04(2015)116", "10.3920/978-90-8686-797-4", "10.1016/j.physletb.2015.12.020", "10.1016/j.physletb.2015.04.042", "10.1016/j.physletb.2016.06.004", "10.1140/epjc/s10052-015-3261-8", "10.1016/j.physletb.2015.10.067", "10.1016/j.physletb.2015.07.065", "10.1163/1876312x-00002195", "10.1016/j.physletb.2013.12.010", "10.1016/j.physletb.2013.01.024", "10.1007/jhep11(2014)056", "10.1007/jhep12(2017)142", "10.1002/pds.4864", "10.1140/epjc/s10052-015-3262-7", "10.1016/j.physletb.2014.09.054", "10.1140/epjc/s10052-015-3373-1", "10.1007/jhep03(2015)041", "10.1016/j.physletb.2016.02.047", "10.4126/frl01-0064018", "10.1016/j.physletb.2014.01.042", "10.1007/jhep09(2014)037", "10.1007/978-94-017-7285-3", "10.1007/s00424-013-1401-2", "10.1007/s00259-017-3822-1", "10.1177/0301006616671273", "10.1007/jhep09(2014)112", "10.1007/jhep06(2015)116", "10.1140/epjc/s10052-018-6243-9", "10.1140/epjc/s10052-017-4692-1", "10.1007/jhep10(2015)144", "10.1007/jhep07(2017)107", "10.1007/jhep11(2014)088", "10.1016/j.physletb.2014.01.006", "10.1007/jhep01(2018)055", "10.1016/j.physletb.2016.03.060", "10.1140/epjc/s10052-019-6904-3", "10.11646/zootaxa.4737.1.1", "10.3934/xx.xx.xx.xx", "10.11646/zootaxa.4758.2.1", "10.1016/j.physletb.2015.10.004", "10.1016/j.physletb.2015.07.053", "10.5798/diclemedj.0921.2012.04.0184", "10.1007/jhep04(2014)169", "10.4126/frl01-0064160", "10.3989/aem.2001.v31.i2", "10.1039/x0xx00000x", "10.11646/zootaxa.3856.4.1", "10.4126/frl01-0064133", "10.1007/jhep05(2015)078", "10.1016/j.physletb.2012.08.020", "10.1007/jhep07(2015)032", "10.1159/000090218", "10.1016/j.physletb.2014.03.015", "10.1007/jhep09(2015)108", "10.1007/jhep09(2015)050", "10.1007/jhep01(2014)163", "10.1016/j.physletb.2014.11.026", "10.1140/epjc/s10052-016-4580-0", "10.1140/epjc/s10052-014-3109-7", "10.1140/epjc/s10052-014-3231-6", "10.1007/jhep02(2014)088", "10.1016/j.physletb.2016.01.056", "10.1016/j.physletb.2015.08.047", "10.1016/j.physletb.2015.12.039", "10.1007/jhep11(2015)071", "10.1140/epjc/s10052-015-3853-3", "10.1007/jhep04(2015)124", "10.1016/j.physletb.2015.07.010", "10.5281/zenodo.3413524", "10.1007/jhep04(2014)031", "10.1007/jhep07(2015)157", "10.1103/physrevd.90.052008", "10.1007/jhep11(2014)118", "10.3920/978-90-8686-708-0", "10.5281/zenodo.1136235", "10.1103/physrevd.86.032003", "10.1016/j.physletb.2016.01.032", "10.1007/jhep03(2018)174", "10.1007/jhep10(2017)182", "10.1140/epjst/e2019-900045-4", "10.1016/j.physletb.2015.06.070", "10.1140/epjc/s10052-016-4067-z", "10.1016/j.physletb.2015.11.042", "10.1007/jhep04(2018)033", "10.1007/jhep09(2014)145", "10.1016/j.physletb.2016.08.055", "10.1016/j.physletb.2015.04.002", "10.1007/jhep03(2014)032", "10.1140/epjc/s10052-017-5491-4", "10.1016/j.physletb.2015.09.062", "10.1016/j.physletb.2014.12.003", "10.1016/j.physletb.2015.03.017", "10.1140/epjc/s10052-014-3195-6", "10.1140/epjc/s10052-016-4034-8", "10.1140/epjc/s10052-016-4070-4", "10.1140/epjc/s10052-018-5693-4", "10.4126/frl01-0064017", "10.1007/jhep08(2014)173", "10.1016/j.physletb.2014.06.076", "10.1016/j.physletb.2018.11.064", "10.1140/epjc/s10052-017-4988-1", "10.11646/zootaxa.4258.4.3", "10.11646/zootaxa.4766.1.2", "10.11646/zootaxa.4780.1.1", "10.5281/zenodo.3693943", "10.4126/frl01-0064129", "10.15330/gal.28.", "10.1007/jhep02(2016)145", "10.1007/jhep04(2014)172", "10.1007/jhep04(2016)005", "10.1007/jhep03(2016)125", "10.1016/j.physletb.2018.02.033", "10.1007/jhep08(2017)052", "10.1007/jhep12(2017)085", "10.1007/jhep09(2014)176", "10.1007/jhep12(2017)024", "10.1140/epjc/s10052-018-5686-3", "10.1016/j.physletb.2016.11.035", "10.1016/j.physletb.2015.12.017", "10.1140/epjc/s10052-015-3542-2", "10.1140/epjc/s10052-014-3071-4", "10.1103/physrevd.97.032009", "10.1140/epjc/s10052-015-3306-z", "10.1016/j.physletb.2017.12.043", "10.1140/epjc/s10052-014-3233-4", "10.1016/j.physletb.2018.09.013", "10.1016/j.gca.2007.06.014", "10.1016/j.physletb.2016.05.005", "10.1038/s41586-019-1171-x", "10.1016/j.physletb.2016.05.087", "10.1007/jhep06(2018)022", "10.1016/j.physletb.2016.01.057", "10.1016/j.physletb.2018.03.023", "10.1140/epjc/s10052-015-3351-7", "10.1126/science.aap8757", "10.1007/jhep09(2015)137", "10.1007/jhep01(2015)063", "10.1007/jhep01(2018)126", "10.1016/j.gca.2007.06.020", "10.1140/epjc/s10052-018-5595-5", "10.1016/j.physletb.2015.02.015", "10.1016/j.physletb.2014.06.077", "10.1007/jhep12(2017)059", "10.1007/jhep10(2017)141", "10.1007/jhep02(2014)107", "10.1140/epjc/s10052-014-2965-5", "10.1016/j.physletb.2015.07.079", "10.1007/jhep10(2017)112", "10.1140/epjc/s10052-014-2982-4", "10.1007/jhep05(2016)160", "10.1016/j.physletb.2016.07.030", "10.1140/epjc/s10052-014-3168-9", "10.1140/epjc/s10052-018-5583-9", "10.1140/epjc/s10052-016-4184-8", "10.1007/jhep08(2015)105", "10.1007/jhep05(2015)061", "10.1103/physrevd.97.032003", "10.1140/epjc/s10052-014-3190-y", "10.1016/j.physletb.2012.10.061", "10.1140/epjc/s10052-014-2941-0", "10.1016/j.physletb.2016.02.002", "10.1016/j.physletb.2016.05.033", "10.1007/jhep01(2014)096", "10.1007/jhep09(2015)201", "10.1016/j.physletb.2016.01.010", "10.1016/j.physletb.2015.07.037", "10.1007/jhep07(2015)042", "10.1016/j.physletb.2016.05.044", "10.1016/j.physletb.2016.05.088", "10.3897/zookeys.2.2", "10.1007/jhep11(2015)018", "10.1007/jhep11(2015)189", "10.1016/j.physletb.2016.10.014", "10.1007/jhep06(2015)080", "10.1016/j.physletb.2014.11.042", "10.1140/epjc/s10052-014-3157-z", "10.1140/epjc/s10052-015-3406-9", "10.1016/j.physletb.2016.02.056", "10.1016/j.physletb.2015.03.054", "10.1140/epjc/s10052-016-4574-y", "10.5252/geodiversitas2019v41a15", "10.1007/jhep09(2014)094", "10.1140/epjc/s10052-017-5486-1", "10.1007/jhep03(2018)095", "10.11646/zootaxa.4736.1.1", "10.11646/zootaxa.4766.2.1", "10.5281/zenodo.3762392", "10.5281/zenodo.3761958", "10.11646/zootaxa.4403.3.2", "10.1553/iswimab", "10.11646/zootaxa.3750.5.1", "10.4126/frl01-0064134", "10.1103/physrevd.87.032002", "10.1140/epjc/s10052-013-2676-3", "10.1007/jhep02(2015)153", "10.1007/jhep08(2017)006", "10.1016/j.physletb.2016.11.005", "10.1007/jhep01(2013)029", "10.1007/jhep10(2017)132", "10.1016/j.physletb.2013.01.034", "10.1016/j.physletb.2016.03.046", "10.1140/epjc/s10052-016-3988-x", "10.1016/j.physletb.2016.07.006", "10.1140/epjc/s10052-018-5752-x", "10.1140/epjc/s10052-015-3454-1", "10.1002/ece3.1303", "10.1007/jhep02(2014)013", "10.1007/jhep06(2016)081", "10.1140/epjc/s10052-014-3117-7", "10.1007/jhep09(2017)084", "10.1016/j.physletb.2017.09.078", "10.1007/jhep08(2016)005", "10.1007/jhep01(2015)020", "10.1140/epjc/s10052-017-4852-3", "10.1016/j.physletb.2018.02.045", "10.7818/sibecolandaeetmeeting.2019", "10.1007/jhep11(2014)104", "10.1007/jhep05(2018)077", "10.1016/j.physletb.2016.11.045", "10.1016/j.physletb.2016.10.042", "10.1140/epjc/s10052-016-4203-9", "10.1007/jhep01(2015)068", "10.1007/jhep06(2016)093", "10.1016/j.physletb.2015.09.051", "10.1140/epjc/s10052-015-3534-2", "10.1007/jhep09(2014)087", "10.1016/j.physletb.2014.05.055", "10.1016/j.physletb.2014.02.033", "10.1140/epjc/s10052-017-5225-7", "10.1140/epjc/s10052-017-5442-0", "10.1016/s0140-6736(18)32335-3", "10.1016/j.physletb.2017.11.049", "10.1007/jhep06(2018)166", "10.1016/j.physletb.2016.05.002", "10.1140/epjc/s10052-016-4219-1", "10.1140/epjst/e2019-900087-0", "10.1007/jhep01(2016)166", "10.1007/jhep01(2018)097", "10.1016/j.physletb.2017.11.043", "10.1016/j.physletb.2018.04.036", "10.1140/epjc/s10052-018-5607-5", "10.1007/jhep12(2017)034", "10.1007/jhep11(2016)112", "10.1007/jhep06(2014)008", "10.1140/epjc/s10052-012-2261-1", "10.1016/j.physletb.2014.08.039", "10.1016/s0140-6736(16)31919-5", "10.1140/epjc/s10052-019-7058-z", "10.1016/j.physletb.2014.07.053", "10.1007/jhep01(2015)053", "10.1016/j.physletb.2016.07.042", "10.1007/jhep08(2014)103", "10.1007/jhep06(2015)100", "10.1140/epjc/s10052-015-3363-3", "10.1140/epjc/s10052-017-4915-5", "10.1140/epjc/s10052-014-3023-z", "10.1140/epjc/s10052-017-5315-6", "10.1140/epjc/s10052-016-4050-8", "10.3389/fpsyt.2017.00244", "10.1016/j.physletb.2014.10.002", "10.1007/jhep07(2015)162", "10.1007/jhep08(2014)174", "10.3897/zookeys.2.23", "10.1007/jhep07(2017)014", "10.1007/jhep04(2016)035", "10.1140/epjc/s10052-017-4984-5", "10.1007/jhep02(2016)156", "10.1016/j.physletb.2016.03.039", "10.1007/jhep07(2018)115", "10.3897/zookeys.34.268", "10.1007/jhep02(2016)122", "10.1016/j.physletb.2012.03.022", "10.1016/j.physletb.2018.09.019", "10.1016/j.physletb.2018.09.024", "10.1051/0004-6361/201629272", "10.1103/physrevc.97.024904", "10.1140/epjc/s10052-016-4521-y", "10.1140/epjc/s10052-016-4176-8", "10.1140/epjc/s10052-014-3134-6", "10.1140/epjc/s10052-016-4110-0", "10.1007/jhep07(2017)121", "10.1007/jhep07(2018)153", "10.1007/jhep03(2018)115", "10.1007/jhep04(2018)060", "10.11606/1807-0205/2020.60.06", "10.4126/frl01-0064015", "10.1007/jhep09(2017)020", "10.1016/j.physletb.2014.04.023", "10.1016/j.physletb.2015.02.048", "10.1007/jhep02(2018)032", "10.1016/j.physletb.2018.01.001", "10.1140/epjc/s10052-015-3852-4", "10.1007/jhep10(2014)087", "10.11646/zootaxa.4630.1.1", "10.5281/zenodo.3742118", "10.4126/frl01-0064022", "10.11646/zootaxa.4758.3.1", "10.11646/zootaxa.4772.3.1", "10.11646/zootaxa.4576.3.5", "10.4126/frl01-0064125", "10.1007/jhep12(2017)017", "10.4126/frl01-0064162", "10.4126/frl01-0064138", "10.1007/jhep06(2014)124", "10.1007/jhep06(2016)059", "10.1007/jhep06(2014)035", "10.1103/physrevd.90.052005", "10.1007/jhep11(2017)062", "10.3847/2041-8213/aa9aed", "10.1016/j.physletb.2016.06.080", "10.1007/jhep10(2017)073", "10.1007/jhep03(2018)167", "10.1016/j.physletb.2018.11.065", "10.1140/epjc/s10052-017-5081-5", "10.1140/epjc/s10052-015-3500-z", "10.1140/epjc/s10052-017-5445-x", "10.1016/j.physletb.2014.01.049", "10.1007/jhep03(2018)172", "10.1016/j.physletb.2015.03.048", "10.1016/j.physletb.2018.11.032", "10.1007/jhep05(2018)025", "10.1016/j.physletb.2016.08.052", "10.1016/j.physletb.2014.09.008", "10.1103/physrevlett.120.071802", "10.1016/j.physletb.2018.01.049", "10.1016/j.physletb.2016.06.017", "10.1016/j.physletb.2016.04.005", "10.1007/jhep06(2018)031", "10.1007/jhep01(2016)079", "10.1007/jhep10(2017)006", "10.1140/epjc/s10052-018-5740-1", "10.1016/j.physletb.2015.01.034", "10.1007/jhep10(2017)005", "10.1016/j.physletb.2018.04.007", "10.1007/jhep04(2015)164", "10.1140/epjc/s10052-018-5691-6", "10.1007/jhep05(2018)148", "10.1007/jhep03(2018)003", "10.1140/epjc/s10052-014-3076-z", "10.1016/j.physletb.2016.02.015", "10.1103/physrevd.97.072003", "10.1016/j.physletb.2017.11.054", "10.1140/epjc/s10052-011-1849-1", "10.1007/jhep09(2016)175", "10.1016/j.physletb.2017.12.011", "10.1007/jhep04(2014)103", "10.1007/jhep12(2014)017", "10.1016/j.physletb.2014.09.048", "10.1140/epjc/s10052-019-7202-9", "10.1007/jhep04(2014)191", "10.1007/jhep07(2013)163", "10.1140/epjc/s10052-014-3130-x", "10.1007/jhep04(2016)023", "10.1016/j.physletb.2015.07.023", "10.1140/epjc/s10052-018-6500-y", "10.1016/j.physletb.2015.04.045", "10.1007/jhep09(2017)053", "10.1007/jhep10(2017)180", "10.1140/epjc/s10052-017-4912-8", "10.1007/jhep10(2016)129", "10.3920/978-90-8686-816-2", "10.1007/jhep01(2017)099", "10.1007/jhep01(2018)045", "10.1007/jhep04(2015)025", "10.1016/j.physletb.2018.02.050", "10.1103/physrevlett.116.032301", "10.1007/jhep08(2017)029", "10.1007/jhep08(2017)073", "10.1016/j.physletb.2014.11.059", "10.1007/jhep01(2013)131", "10.1007/jhep06(2014)112", "10.1016/j.physletb.2017.09.066", "10.1140/epjc/s10052-014-2883-6", "10.1094/mpmi", "10.1007/jhep11(2017)195", "10.1007/jhep06(2018)108", "10.1007/jhep09(2018)139", "10.1016/j.physletb.2016.12.005", "10.1140/epjc/s10052-017-5349-9", "10.1016/j.physletb.2012.08.021", "10.1016/j.physletb.2014.10.032", "10.1007/jhep09(2017)088", "10.1140/epjc/s10052-015-3425-6", "10.1007/jhep01(2018)054", "10.1103/physrevlett.110.182302", "10.1140/epjc/s10052-017-5317-4", "10.1007/jhep01(2017)117", "10.1016/j.physletb.2017.12.006", "10.1016/j.physletb.2018.02.004", "10.1016/j.physletb.2018.02.025", "10.1016/j.physletb.2016.02.055", "10.1016/j.physletb.2016.04.061", "10.1140/epjc/s10052-015-3372-2", "10.1016/j.physletb.2015.02.051", "10.1016/j.physletb.2014.11.049", "10.1007/jhep09(2016)001", "10.1016/j.physletb.2016.03.017", "10.1007/jhep06(2016)067", "10.1140/epjc/s10052-015-3543-1", "10.1140/epjc/s10052-017-4911-9", "10.1007/jhep07(2013)122", "10.1140/epjc/s10052-019-6855-8", "10.1140/epjc/s10052-019-6540-y", "10.1007/jhep06(2014)009", "10.1007/jhep05(2019)043", "10.1016/j.physletb.2016.01.028", "10.1103/physrevlett.120.231801", "10.1140/epjc/s10052-016-4325-0", "10.1007/jhep07(2018)127", "10.1016/j.physletb.2016.05.003", "10.1140/epjc/s10052-017-4644-9", "10.1140/epjc/s10052-017-4700-5", "10.1007/jhep06(2018)107", "10.1016/j.physletb.2018.01.042", "10.1140/epjc/s10052-018-5624-4", "10.1007/jhep08(2016)139", "10.1007/jhep05(2018)195", "10.1103/physrevd.97.052012", "10.1140/epjc/s10052-016-3978-z", "10.1007/jhep05(2019)088", "10.1140/epjc/s10052-017-5079-z", "10.1140/epjc/s10052-016-4205-7", "10.1007/jhep01(2016)006", "10.1140/epjc/s10052-016-4286-3", "10.1016/j.physletb.2017.04.071", "10.1103/physrevd.97.012007", "10.1016/j.physletb.2018.01.077", "10.1007/jhep04(2018)073", "10.1016/j.physletb.2015.09.057", "10.1007/jhep07(2018)032", "10.1140/epjc/s10052-015-3435-4", "10.1007/jhep11(2017)010", "10.1093/isd/ixaa002", "10.1016/j.physletb.2018.03.035", "10.1007/jhep10(2018)031", "10.1016/s0140-6736(18)31891-9", "10.1140/epjc/s10052-018-6148-7", "10.1016/j.physletb.2018.03.057", "10.1140/epjc/s10052-019-6632-8", "10.1016/j.physletb.2015.11.071", "10.1140/epjc/s10052-018-5605-7", "10.1016/j.physletb.2018.10.073", "10.1140/epjc/s10052-019-7387-y", "10.1007/jhep06(2019)143", "10.1140/epjc/s10052-018-5567-9", "10.1140/epjc/s10052-019-6909-y", "10.1002/(sici)1521-3978(199901)47:1/3", "10.5281/zenodo.3758372", "10.4126/frl01-0064041", "10.1140/epjc/s10052-014-3129-3", "10.11646/zootaxa.4685.1.1", "10.11646/zootaxa.4756.1.1", "10.6101/azq/0001", "10.14582/duzg", "10.1016/j.physletb.2012.11.039", "10.4126/frl01-0064191", "10.1016/j.physletb.2013.12.029", "10.1007/jhep10(2013)189", "10.1051/0004-6361/201629512", "10.1007/jhep01(2013)116", "10.2312/gfz.lis.2016.001", "10.1016/j.physletb.2013.01.040", "10.1103/physrevd.90.112005", "10.1140/epjc/s10052-015-3726-9", "10.1007/s11682-013-9269-5", "10.1007/jhep02(2017)071", "10.1016/j.physletb.2016.09.040", "10.1007/jhep02(2017)117", "10.1007/jhep08(2016)009", "10.1103/physrevd.97.052010", "10.1007/jhep09(2017)032", "10.1103/physrevd.97.032005", "10.1140/epjc/s10052-017-4965-8", "10.1016/j.physletb.2016.08.042", "10.1016/j.physletb.2017.10.039", "10.1007/jhep03(2016)127", "10.1140/epjc/s10052-014-3034-9", "10.1007/jhep03(2017)113", "10.1007/jhep11(2018)040", "10.1140/epjc/s10052-018-6457-x", "10.1140/epjc/s10052-016-4041-9", "10.1140/epjc/s10052-018-6219-9", "10.1140/epjc/s10052-016-4149-y", "10.1007/jhep10(2017)072", "10.1140/epjc/s10052-016-4083-z", "10.1140/epjc/s10052-016-3956-5", "10.1007/jhep04(2016)073", "10.1007/jhep06(2016)177", "10.1016/j.physletb.2018.03.084", "10.1007/jhep10(2015)128", "10.1007/jhep03(2018)166", "10.1140/epjc/s10052-015-3491-9", "10.1016/j.physletb.2015.04.060", "10.1103/physrevd.92.112001", "10.1140/epjc/s10052-015-3367-z", "10.1007/jhep10(2017)019", "10.1007/jhep10(2017)131", "10.1016/j.physletb.2018.08.057", "10.1007/jhep01(2016)096", "10.1016/j.physletb.2017.09.053", "10.1007/jhep07(2017)013", "10.1007/jhep01(2019)030", "10.1007/jhep11(2016)110", "10.1016/j.physletb.2012.02.044", "10.1140/epjc/s10052-017-5192-z", "10.1007/jhep03(2015)022", "10.1140/epjc/s10052-019-6847-8", "10.1093/database/baz085", "10.1140/epjc/s10052-015-3451-4", "10.1007/jhep11(2017)029", "10.1140/epjc/s10052-015-3517-3", "10.1007/jhep07(2017)001", "10.1007/jhep09(2016)074", "10.1103/physrevd.97.072016", "10.1007/jhep05(2018)006", "10.1103/physrevlett.120.081801", "10.1103/physrevlett.120.161802", "10.1103/physrevlett.120.202005", "10.5281/zenodo.1299123", "10.5281/zenodo.3777294" ],
+ "pmid" : [],
+ "pmc" : []
+}
\ No newline at end of file
diff --git a/dhp-common/src/main/scala/eu/dnetlib/dhp/application/SparkScalaApplication.scala b/dhp-common/src/main/scala/eu/dnetlib/dhp/application/SparkScalaApplication.scala
new file mode 100644
index 000000000..f8afe9af4
--- /dev/null
+++ b/dhp-common/src/main/scala/eu/dnetlib/dhp/application/SparkScalaApplication.scala
@@ -0,0 +1,73 @@
+package eu.dnetlib.dhp.application
+
+import scala.io.Source
+
+/** This is the main Interface SparkApplication
+ * where all the Spark Scala class should inherit
+ */
+trait SparkScalaApplication {
+
+ /** This is the path in the classpath of the json
+ * describes all the argument needed to run
+ */
+ val propertyPath: String
+
+ /** Utility to parse the arguments using the
+ * property json in the classpath identified from
+ * the variable propertyPath
+ *
+ * @param args the list of arguments
+ */
+ def parseArguments(args: Array[String]): ArgumentApplicationParser = {
+ val parser = new ArgumentApplicationParser(
+ Source.fromInputStream(getClass.getResourceAsStream(propertyPath)).mkString
+ )
+ parser.parseArgument(args)
+ parser
+ }
+
+ /** Here all the spark applications runs this method
+ * where the whole logic of the spark node is defined
+ */
+ def run(): Unit
+}
+
+import org.apache.spark.SparkConf
+import org.apache.spark.sql.SparkSession
+import org.slf4j.Logger
+
+abstract class AbstractScalaApplication(
+ val propertyPath: String,
+ val args: Array[String],
+ log: Logger
+) extends SparkScalaApplication {
+
+ var parser: ArgumentApplicationParser = null
+
+ var spark: SparkSession = null
+
+ def initialize(): SparkScalaApplication = {
+ parser = parseArguments(args)
+ spark = createSparkSession()
+ this
+ }
+
+ /** Utility for creating a spark session starting from parser
+ *
+ * @return a spark Session
+ */
+ private def createSparkSession(): SparkSession = {
+ require(parser != null)
+
+ val conf: SparkConf = new SparkConf()
+ val master = parser.get("master")
+ log.info(s"Creating Spark session: Master: $master")
+ SparkSession
+ .builder()
+ .config(conf)
+ .appName(getClass.getSimpleName)
+ .master(master)
+ .getOrCreate()
+ }
+
+}
diff --git a/dhp-common/src/main/scala/eu/dnetlib/dhp/sx/graph/scholix/ScholixUtils.scala b/dhp-common/src/main/scala/eu/dnetlib/dhp/sx/graph/scholix/ScholixUtils.scala
new file mode 100644
index 000000000..a995016a8
--- /dev/null
+++ b/dhp-common/src/main/scala/eu/dnetlib/dhp/sx/graph/scholix/ScholixUtils.scala
@@ -0,0 +1,442 @@
+package eu.dnetlib.dhp.sx.graph.scholix
+
+import eu.dnetlib.dhp.schema.oaf.{Publication, Relation, Result, StructuredProperty}
+import eu.dnetlib.dhp.schema.sx.scholix._
+import eu.dnetlib.dhp.schema.sx.summary.{CollectedFromType, SchemeValue, ScholixSummary, Typology}
+import eu.dnetlib.dhp.utils.DHPUtils
+import org.apache.spark.sql.expressions.Aggregator
+import org.apache.spark.sql.{Encoder, Encoders}
+import org.json4s
+import org.json4s.DefaultFormats
+import org.json4s.jackson.JsonMethods.parse
+import scala.collection.JavaConverters._
+import scala.io.Source
+
+object ScholixUtils extends Serializable {
+
+ val DNET_IDENTIFIER_SCHEMA: String = "DNET Identifier"
+
+ val DATE_RELATION_KEY: String = "RelationDate"
+
+ case class RelationVocabulary(original: String, inverse: String) {}
+
+ case class RelatedEntities(id: String, relatedDataset: Long, relatedPublication: Long) {}
+
+ val relations: Map[String, RelationVocabulary] = {
+ val input = Source
+ .fromInputStream(
+ getClass.getResourceAsStream("/eu/dnetlib/scholexplorer/relation/relations.json")
+ )
+ .mkString
+ implicit lazy val formats: DefaultFormats.type = org.json4s.DefaultFormats
+
+ lazy val json: json4s.JValue = parse(input)
+
+ json.extract[Map[String, RelationVocabulary]]
+ }
+
+ def extractRelationDate(relation: Relation): String = {
+
+ if (relation.getProperties == null || !relation.getProperties.isEmpty)
+ null
+ else {
+ val date = relation.getProperties.asScala
+ .find(p => DATE_RELATION_KEY.equalsIgnoreCase(p.getKey))
+ .map(p => p.getValue)
+ if (date.isDefined)
+ date.get
+ else
+ null
+ }
+ }
+
+ def extractRelationDate(summary: ScholixSummary): String = {
+
+ if (summary.getDate == null || summary.getDate.isEmpty)
+ null
+ else {
+ summary.getDate.get(0)
+ }
+ }
+
+ def inverseRelationShip(rel: ScholixRelationship): ScholixRelationship = {
+ new ScholixRelationship(rel.getInverse, rel.getSchema, rel.getName)
+
+ }
+
+ def generateScholixResourceFromResult(r: Result): ScholixResource = {
+ generateScholixResourceFromSummary(ScholixUtils.resultToSummary(r))
+ }
+
+ val statsAggregator: Aggregator[(String, String, Long), RelatedEntities, RelatedEntities] =
+ new Aggregator[(String, String, Long), RelatedEntities, RelatedEntities] with Serializable {
+ override def zero: RelatedEntities = null
+
+ override def reduce(b: RelatedEntities, a: (String, String, Long)): RelatedEntities = {
+ val relatedDataset = if ("dataset".equalsIgnoreCase(a._2)) a._3 else 0
+ val relatedPublication = if ("publication".equalsIgnoreCase(a._2)) a._3 else 0
+
+ if (b == null)
+ RelatedEntities(a._1, relatedDataset, relatedPublication)
+ else
+ RelatedEntities(
+ a._1,
+ b.relatedDataset + relatedDataset,
+ b.relatedPublication + relatedPublication
+ )
+ }
+
+ override def merge(b1: RelatedEntities, b2: RelatedEntities): RelatedEntities = {
+ if (b1 != null && b2 != null)
+ RelatedEntities(
+ b1.id,
+ b1.relatedDataset + b2.relatedDataset,
+ b1.relatedPublication + b2.relatedPublication
+ )
+ else if (b1 != null)
+ b1
+ else
+ b2
+ }
+
+ override def finish(reduction: RelatedEntities): RelatedEntities = reduction
+
+ override def bufferEncoder: Encoder[RelatedEntities] = Encoders.bean(classOf[RelatedEntities])
+
+ override def outputEncoder: Encoder[RelatedEntities] = Encoders.bean(classOf[RelatedEntities])
+ }
+
+ val scholixAggregator: Aggregator[(String, Scholix), Scholix, Scholix] =
+ new Aggregator[(String, Scholix), Scholix, Scholix] with Serializable {
+ override def zero: Scholix = null
+
+ def scholix_complete(s: Scholix): Boolean = {
+ if (s == null || s.getIdentifier == null) {
+ false
+ } else if (s.getSource == null || s.getTarget == null) {
+ false
+ } else if (s.getLinkprovider == null || s.getLinkprovider.isEmpty)
+ false
+ else
+ true
+ }
+
+ override def reduce(b: Scholix, a: (String, Scholix)): Scholix = {
+ if (scholix_complete(b)) b else a._2
+ }
+
+ override def merge(b1: Scholix, b2: Scholix): Scholix = {
+ if (scholix_complete(b1)) b1 else b2
+ }
+
+ override def finish(reduction: Scholix): Scholix = reduction
+
+ override def bufferEncoder: Encoder[Scholix] = Encoders.kryo[Scholix]
+
+ override def outputEncoder: Encoder[Scholix] = Encoders.kryo[Scholix]
+ }
+
+ def createInverseScholixRelation(scholix: Scholix): Scholix = {
+ val s = new Scholix
+ s.setPublicationDate(scholix.getPublicationDate)
+ s.setPublisher(scholix.getPublisher)
+ s.setLinkprovider(scholix.getLinkprovider)
+ s.setRelationship(inverseRelationShip(scholix.getRelationship))
+ s.setSource(scholix.getTarget)
+ s.setTarget(scholix.getSource)
+ s.setIdentifier(
+ DHPUtils.md5(
+ s"${s.getSource.getIdentifier}::${s.getRelationship.getName}::${s.getTarget.getIdentifier}"
+ )
+ )
+ s
+
+ }
+
+ def extractCollectedFrom(summary: ScholixResource): List[ScholixEntityId] = {
+ if (summary.getCollectedFrom != null && !summary.getCollectedFrom.isEmpty) {
+ val l: List[ScholixEntityId] = summary.getCollectedFrom.asScala.map { d =>
+ new ScholixEntityId(d.getProvider.getName, d.getProvider.getIdentifiers)
+ }(collection.breakOut)
+ l
+ } else List()
+ }
+
+ def extractCollectedFrom(summary: ScholixSummary): List[ScholixEntityId] = {
+ if (summary.getDatasources != null && !summary.getDatasources.isEmpty) {
+ val l: List[ScholixEntityId] = summary.getDatasources.asScala.map { d =>
+ new ScholixEntityId(
+ d.getDatasourceName,
+ List(new ScholixIdentifier(d.getDatasourceId, "DNET Identifier", null)).asJava
+ )
+ }(collection.breakOut)
+ l
+ } else List()
+ }
+
+ def extractCollectedFrom(relation: Relation): List[ScholixEntityId] = {
+ if (relation.getCollectedfrom != null && !relation.getCollectedfrom.isEmpty) {
+
+ val l: List[ScholixEntityId] = relation.getCollectedfrom.asScala.map { c =>
+ new ScholixEntityId(
+ c.getValue,
+ List(new ScholixIdentifier(c.getKey, DNET_IDENTIFIER_SCHEMA, null)).asJava
+ )
+ }.toList
+ l
+ } else List()
+ }
+
+ def generateCompleteScholix(scholix: Scholix, target: ScholixSummary): Scholix = {
+ val s = new Scholix
+ s.setPublicationDate(scholix.getPublicationDate)
+ s.setPublisher(scholix.getPublisher)
+ s.setLinkprovider(scholix.getLinkprovider)
+ s.setRelationship(scholix.getRelationship)
+ s.setSource(scholix.getSource)
+ s.setTarget(generateScholixResourceFromSummary(target))
+ s.setIdentifier(
+ DHPUtils.md5(
+ s"${s.getSource.getIdentifier}::${s.getRelationship.getName}::${s.getTarget.getIdentifier}"
+ )
+ )
+ s
+ }
+
+ def generateCompleteScholix(scholix: Scholix, target: ScholixResource): Scholix = {
+ val s = new Scholix
+ s.setPublicationDate(scholix.getPublicationDate)
+ s.setPublisher(scholix.getPublisher)
+ s.setLinkprovider(scholix.getLinkprovider)
+ s.setRelationship(scholix.getRelationship)
+ s.setSource(scholix.getSource)
+ s.setTarget(target)
+ s.setIdentifier(
+ DHPUtils.md5(
+ s"${s.getSource.getIdentifier}::${s.getRelationship.getName}::${s.getTarget.getIdentifier}"
+ )
+ )
+ s
+ }
+
+ def generateScholixResourceFromSummary(summaryObject: ScholixSummary): ScholixResource = {
+ val r = new ScholixResource
+ r.setIdentifier(summaryObject.getLocalIdentifier)
+ r.setDnetIdentifier(summaryObject.getId)
+
+ r.setObjectType(summaryObject.getTypology.toString)
+ r.setObjectSubType(summaryObject.getSubType)
+
+ if (summaryObject.getTitle != null && !summaryObject.getTitle.isEmpty)
+ r.setTitle(summaryObject.getTitle.get(0))
+
+ if (summaryObject.getAuthor != null && !summaryObject.getAuthor.isEmpty) {
+ val l: List[ScholixEntityId] =
+ summaryObject.getAuthor.asScala.map(a => new ScholixEntityId(a, null)).toList
+ if (l.nonEmpty)
+ r.setCreator(l.asJava)
+ }
+
+ if (summaryObject.getDate != null && !summaryObject.getDate.isEmpty)
+ r.setPublicationDate(summaryObject.getDate.get(0))
+ if (summaryObject.getPublisher != null && !summaryObject.getPublisher.isEmpty) {
+ val plist: List[ScholixEntityId] =
+ summaryObject.getPublisher.asScala.map(p => new ScholixEntityId(p, null)).toList
+
+ if (plist.nonEmpty)
+ r.setPublisher(plist.asJava)
+ }
+
+ if (summaryObject.getDatasources != null && !summaryObject.getDatasources.isEmpty) {
+
+ val l: List[ScholixCollectedFrom] = summaryObject.getDatasources.asScala
+ .map(c =>
+ new ScholixCollectedFrom(
+ new ScholixEntityId(
+ c.getDatasourceName,
+ List(new ScholixIdentifier(c.getDatasourceId, DNET_IDENTIFIER_SCHEMA, null)).asJava
+ ),
+ "collected",
+ "complete"
+ )
+ )
+ .toList
+
+ if (l.nonEmpty)
+ r.setCollectedFrom(l.asJava)
+
+ }
+ r
+ }
+
+ def scholixFromSource(relation: Relation, source: ScholixResource): Scholix = {
+ if (relation == null || source == null)
+ return null
+ val s = new Scholix
+ var l: List[ScholixEntityId] = extractCollectedFrom(relation)
+ if (l.isEmpty)
+ l = extractCollectedFrom(source)
+ if (l.isEmpty)
+ return null
+ s.setLinkprovider(l.asJava)
+ var d = extractRelationDate(relation)
+ if (d == null)
+ d = source.getPublicationDate
+
+ s.setPublicationDate(d)
+
+ if (source.getPublisher != null && !source.getPublisher.isEmpty) {
+ s.setPublisher(source.getPublisher)
+ }
+
+ val semanticRelation = relations.getOrElse(relation.getRelClass.toLowerCase, null)
+ if (semanticRelation == null)
+ return null
+ s.setRelationship(
+ new ScholixRelationship(semanticRelation.original, "datacite", semanticRelation.inverse)
+ )
+ s.setSource(source)
+
+ s
+ }
+
+ def scholixFromSource(relation: Relation, source: ScholixSummary): Scholix = {
+
+ if (relation == null || source == null)
+ return null
+
+ val s = new Scholix
+
+ var l: List[ScholixEntityId] = extractCollectedFrom(relation)
+ if (l.isEmpty)
+ l = extractCollectedFrom(source)
+ if (l.isEmpty)
+ return null
+
+ s.setLinkprovider(l.asJava)
+
+ var d = extractRelationDate(relation)
+ if (d == null)
+ d = extractRelationDate(source)
+
+ s.setPublicationDate(d)
+
+ if (source.getPublisher != null && !source.getPublisher.isEmpty) {
+ val l: List[ScholixEntityId] = source.getPublisher.asScala
+ .map { p =>
+ new ScholixEntityId(p, null)
+ }(collection.breakOut)
+
+ if (l.nonEmpty)
+ s.setPublisher(l.asJava)
+ }
+
+ val semanticRelation = relations.getOrElse(relation.getRelClass.toLowerCase, null)
+ if (semanticRelation == null)
+ return null
+ s.setRelationship(
+ new ScholixRelationship(semanticRelation.original, "datacite", semanticRelation.inverse)
+ )
+ s.setSource(generateScholixResourceFromSummary(source))
+
+ s
+ }
+
+ def findURLForPID(
+ pidValue: List[StructuredProperty],
+ urls: List[String]
+ ): List[(StructuredProperty, String)] = {
+ pidValue.map { p =>
+ val pv = p.getValue
+
+ val r = urls.find(u => u.toLowerCase.contains(pv.toLowerCase))
+ (p, r.orNull)
+ }
+ }
+
+ def extractTypedIdentifierFromInstance(r: Result): List[ScholixIdentifier] = {
+ if (r.getInstance() == null || r.getInstance().isEmpty)
+ return List()
+ r.getInstance()
+ .asScala
+ .filter(i => i.getUrl != null && !i.getUrl.isEmpty)
+ .filter(i => i.getPid != null && i.getUrl != null)
+ .flatMap(i => findURLForPID(i.getPid.asScala.toList, i.getUrl.asScala.toList))
+ .map(i => new ScholixIdentifier(i._1.getValue, i._1.getQualifier.getClassid, i._2))
+ .distinct
+ .toList
+ }
+
+ def resultToSummary(r: Result): ScholixSummary = {
+ val s = new ScholixSummary
+ s.setId(r.getId)
+ if (r.getPid == null || r.getPid.isEmpty)
+ return null
+
+ val persistentIdentifiers: List[ScholixIdentifier] = extractTypedIdentifierFromInstance(r)
+ if (persistentIdentifiers.isEmpty)
+ return null
+ s.setLocalIdentifier(persistentIdentifiers.asJava)
+ if (r.isInstanceOf[Publication])
+ s.setTypology(Typology.publication)
+ else
+ s.setTypology(Typology.dataset)
+
+ s.setSubType(r.getInstance().get(0).getInstancetype.getClassname)
+
+ if (r.getTitle != null && r.getTitle.asScala.nonEmpty) {
+ val titles: List[String] = r.getTitle.asScala.map(t => t.getValue).toList
+ if (titles.nonEmpty)
+ s.setTitle(titles.asJava)
+ else
+ return null
+ }
+
+ if (r.getAuthor != null && !r.getAuthor.isEmpty) {
+ val authors: List[String] = r.getAuthor.asScala.map(a => a.getFullname).toList
+ if (authors.nonEmpty)
+ s.setAuthor(authors.asJava)
+ }
+ if (r.getInstance() != null) {
+ val dt: List[String] = r
+ .getInstance()
+ .asScala
+ .filter(i => i.getDateofacceptance != null)
+ .map(i => i.getDateofacceptance.getValue)
+ .toList
+ if (dt.nonEmpty)
+ s.setDate(dt.distinct.asJava)
+ }
+ if (r.getDescription != null && !r.getDescription.isEmpty) {
+ val d = r.getDescription.asScala.find(f => f != null && f.getValue != null)
+ if (d.isDefined)
+ s.setDescription(d.get.getValue)
+ }
+
+ if (r.getSubject != null && !r.getSubject.isEmpty) {
+ val subjects: List[SchemeValue] = r.getSubject.asScala
+ .map(s => new SchemeValue(s.getQualifier.getClassname, s.getValue))
+ .toList
+ if (subjects.nonEmpty)
+ s.setSubject(subjects.asJava)
+ }
+
+ if (r.getPublisher != null)
+ s.setPublisher(List(r.getPublisher.getValue).asJava)
+
+ if (r.getCollectedfrom != null && !r.getCollectedfrom.isEmpty) {
+ val cf: List[CollectedFromType] = r.getCollectedfrom.asScala
+ .map(c => new CollectedFromType(c.getValue, c.getKey, "complete"))
+ .toList
+ if (cf.nonEmpty)
+ s.setDatasources(cf.distinct.asJava)
+ }
+
+ s.setRelatedDatasets(0)
+ s.setRelatedPublications(0)
+ s.setRelatedUnknown(0)
+
+ s
+ }
+
+}
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java
index e14020830..1788239f2 100644
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java
@@ -7,10 +7,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test;
-public class ArgumentApplicationParserTest {
+class ArgumentApplicationParserTest {
@Test
- public void testParseParameter() throws Exception {
+ void testParseParameter() throws Exception {
final String jsonConfiguration = IOUtils
.toString(
this.getClass().getResourceAsStream("/eu/dnetlib/application/parameters.json"));
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/common/HdfsSupportTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/common/HdfsSupportTest.java
index 870943816..fa721d5e5 100644
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/common/HdfsSupportTest.java
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/common/HdfsSupportTest.java
@@ -21,13 +21,13 @@ public class HdfsSupportTest {
class Remove {
@Test
- public void shouldThrowARuntimeExceptionOnError() {
+ void shouldThrowARuntimeExceptionOnError() {
// when
assertThrows(RuntimeException.class, () -> HdfsSupport.remove(null, new Configuration()));
}
@Test
- public void shouldRemoveADirFromHDFS(@TempDir Path tempDir) {
+ void shouldRemoveADirFromHDFS(@TempDir Path tempDir) {
// when
HdfsSupport.remove(tempDir.toString(), new Configuration());
@@ -36,7 +36,7 @@ public class HdfsSupportTest {
}
@Test
- public void shouldRemoveAFileFromHDFS(@TempDir Path tempDir) throws IOException {
+ void shouldRemoveAFileFromHDFS(@TempDir Path tempDir) throws IOException {
// given
Path file = Files.createTempFile(tempDir, "p", "s");
@@ -52,13 +52,13 @@ public class HdfsSupportTest {
class ListFiles {
@Test
- public void shouldThrowARuntimeExceptionOnError() {
+ void shouldThrowARuntimeExceptionOnError() {
// when
assertThrows(RuntimeException.class, () -> HdfsSupport.listFiles(null, new Configuration()));
}
@Test
- public void shouldListFilesLocatedInPath(@TempDir Path tempDir) throws IOException {
+ void shouldListFilesLocatedInPath(@TempDir Path tempDir) throws IOException {
Path subDir1 = Files.createTempDirectory(tempDir, "list_me");
Path subDir2 = Files.createTempDirectory(tempDir, "list_me");
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/common/PacePersonTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/common/PacePersonTest.java
index 5ebd7213e..cb9ae2886 100644
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/common/PacePersonTest.java
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/common/PacePersonTest.java
@@ -5,10 +5,10 @@ import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-public class PacePersonTest {
+class PacePersonTest {
@Test
- public void pacePersonTest1() {
+ void pacePersonTest1() {
PacePerson p = new PacePerson("Artini, Michele", false);
assertEquals("Artini", p.getSurnameString());
@@ -17,7 +17,7 @@ public class PacePersonTest {
}
@Test
- public void pacePersonTest2() {
+ void pacePersonTest2() {
PacePerson p = new PacePerson("Michele G. Artini", false);
assertEquals("Artini, Michele G.", p.getNormalisedFullname());
assertEquals("Michele G", p.getNameString());
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java
index 2f01c0863..8fa966c2f 100644
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java
@@ -18,7 +18,8 @@ public class SparkSessionSupportTest {
class RunWithSparkSession {
@Test
- public void shouldExecuteFunctionAndNotStopSparkSessionWhenSparkSessionIsNotManaged()
+ @SuppressWarnings("unchecked")
+ void shouldExecuteFunctionAndNotStopSparkSessionWhenSparkSessionIsNotManaged()
throws Exception {
// given
SparkSession spark = mock(SparkSession.class);
@@ -37,7 +38,8 @@ public class SparkSessionSupportTest {
}
@Test
- public void shouldExecuteFunctionAndStopSparkSessionWhenSparkSessionIsManaged()
+ @SuppressWarnings("unchecked")
+ void shouldExecuteFunctionAndStopSparkSessionWhenSparkSessionIsManaged()
throws Exception {
// given
SparkSession spark = mock(SparkSession.class);
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java
index f961d6748..2ccaed3e4 100644
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java
@@ -12,15 +12,39 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@Disabled
-public class ZenodoAPIClientTest {
+class ZenodoAPIClientTest {
private final String URL_STRING = "https://sandbox.zenodo.org/api/deposit/depositions";
private final String ACCESS_TOKEN = "";
private final String CONCEPT_REC_ID = "657113";
+ private final String depositionId = "674915";
+
@Test
- public void testNewDeposition() throws IOException {
+ void testUploadOldDeposition() throws IOException, MissingConceptDoiException {
+ ZenodoAPIClient client = new ZenodoAPIClient(URL_STRING,
+ ACCESS_TOKEN);
+ Assertions.assertEquals(200, client.uploadOpenDeposition(depositionId));
+
+ File file = new File(getClass()
+ .getResource("/eu/dnetlib/dhp/common/api/COVID-19.json.gz")
+ .getPath());
+
+ InputStream is = new FileInputStream(file);
+
+ Assertions.assertEquals(200, client.uploadIS(is, "COVID-19.json.gz", file.length()));
+
+ String metadata = IOUtils.toString(getClass().getResourceAsStream("/eu/dnetlib/dhp/common/api/metadata.json"));
+
+ Assertions.assertEquals(200, client.sendMretadata(metadata));
+
+ Assertions.assertEquals(202, client.publish());
+
+ }
+
+ @Test
+ void testNewDeposition() throws IOException {
ZenodoAPIClient client = new ZenodoAPIClient(URL_STRING,
ACCESS_TOKEN);
@@ -43,7 +67,7 @@ public class ZenodoAPIClientTest {
}
@Test
- public void testNewVersionNewName() throws IOException, MissingConceptDoiException {
+ void testNewVersionNewName() throws IOException, MissingConceptDoiException {
ZenodoAPIClient client = new ZenodoAPIClient(URL_STRING,
ACCESS_TOKEN);
@@ -63,7 +87,7 @@ public class ZenodoAPIClientTest {
}
@Test
- public void testNewVersionOldName() throws IOException, MissingConceptDoiException {
+ void testNewVersionOldName() throws IOException, MissingConceptDoiException {
ZenodoAPIClient client = new ZenodoAPIClient(URL_STRING,
ACCESS_TOKEN);
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/model/mdstore/MetadataRecordTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/model/mdstore/MetadataRecordTest.java
deleted file mode 100644
index cb4d0ab50..000000000
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/model/mdstore/MetadataRecordTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-
-package eu.dnetlib.dhp.model.mdstore;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.junit.jupiter.api.Test;
-
-public class MetadataRecordTest {
-
- @Test
- public void getTimestamp() {
-
- MetadataRecord r = new MetadataRecord();
- assertTrue(r.getDateOfCollection() > 0);
- }
-}
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/oa/merge/AuthorMergerTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/oa/merge/AuthorMergerTest.java
new file mode 100644
index 000000000..3a7a41a1b
--- /dev/null
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/oa/merge/AuthorMergerTest.java
@@ -0,0 +1,100 @@
+
+package eu.dnetlib.dhp.oa.merge;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.oaf.Author;
+import eu.dnetlib.dhp.schema.oaf.Publication;
+import eu.dnetlib.dhp.schema.oaf.StructuredProperty;
+import eu.dnetlib.pace.util.MapDocumentUtil;
+import scala.Tuple2;
+
+class AuthorMergerTest {
+
+ private String publicationsBasePath;
+
+ private List> authors;
+
+ @BeforeEach
+ public void setUp() throws Exception {
+
+ publicationsBasePath = Paths
+ .get(AuthorMergerTest.class.getResource("/eu/dnetlib/dhp/oa/merge").toURI())
+ .toFile()
+ .getAbsolutePath();
+
+ authors = readSample(publicationsBasePath + "/publications_with_authors.json", Publication.class)
+ .stream()
+ .map(p -> p._2().getAuthor())
+ .collect(Collectors.toList());
+
+ }
+
+ @Test
+ void mergeTest() { // used in the dedup: threshold set to 0.95
+
+ for (List authors1 : authors) {
+ System.out.println("List " + (authors.indexOf(authors1) + 1));
+ for (Author author : authors1) {
+ System.out.println(authorToString(author));
+ }
+ }
+
+ List merge = AuthorMerger.merge(authors);
+
+ System.out.println("Merge ");
+ for (Author author : merge) {
+ System.out.println(authorToString(author));
+ }
+
+ Assertions.assertEquals(7, merge.size());
+
+ }
+
+ public List> readSample(String path, Class clazz) {
+ List> res = new ArrayList<>();
+ BufferedReader reader;
+ try {
+ reader = new BufferedReader(new FileReader(path));
+ String line = reader.readLine();
+ while (line != null) {
+ res
+ .add(
+ new Tuple2<>(
+ MapDocumentUtil.getJPathString("$.id", line),
+ new ObjectMapper().readValue(line, clazz)));
+ // read next line
+ line = reader.readLine();
+ }
+ reader.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return res;
+ }
+
+ public String authorToString(Author a) {
+
+ String print = "Fullname = ";
+ print += a.getFullname() + " pid = [";
+ if (a.getPid() != null)
+ for (StructuredProperty sp : a.getPid()) {
+ print += sp.toComparableString() + " ";
+ }
+ print += "]";
+ return print;
+ }
+}
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java
deleted file mode 100644
index d458c613e..000000000
--- a/dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/IdentifierFactoryTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package eu.dnetlib.dhp.schema.oaf.utils;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.Test;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.schema.oaf.Publication;
-import eu.dnetlib.dhp.utils.DHPUtils;
-
-public class IdentifierFactoryTest {
-
- private static ObjectMapper OBJECT_MAPPER = new ObjectMapper()
- .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-
- @Test
- public void testCreateIdentifierForPublication() throws IOException {
-
- verifyIdentifier("publication_doi.json", "50|doi_________::" + DHPUtils.md5("10.1016/j.cmet.2011.03.013"));
- verifyIdentifier("publication_pmc.json", "50|pmc_________::" + DHPUtils.md5("21459329"));
- verifyIdentifier(
- "publication_urn.json",
- "50|urn_________::" + DHPUtils.md5("urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"));
-
- final String defaultID = "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f";
- verifyIdentifier("publication_3.json", defaultID);
- verifyIdentifier("publication_4.json", defaultID);
- verifyIdentifier("publication_5.json", defaultID);
- }
-
- protected void verifyIdentifier(String filename, String expectedID) throws IOException {
- final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
- final Publication pub = OBJECT_MAPPER.readValue(json, Publication.class);
-
- String id = IdentifierFactory.createIdentifier(pub);
-
- assertNotNull(id);
- assertEquals(expectedID, id);
- }
-
-}
diff --git a/dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java b/dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java
new file mode 100644
index 000000000..9111ac2df
--- /dev/null
+++ b/dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java
@@ -0,0 +1,212 @@
+
+package eu.dnetlib.dhp.schema.oaf.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import eu.dnetlib.dhp.schema.common.ModelConstants;
+import eu.dnetlib.dhp.schema.oaf.Dataset;
+import eu.dnetlib.dhp.schema.oaf.KeyValue;
+import eu.dnetlib.dhp.schema.oaf.Publication;
+import eu.dnetlib.dhp.schema.oaf.Result;
+import me.xuender.unidecode.Unidecode;
+
+class OafMapperUtilsTest {
+
+ private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+ .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+ @Test
+ public void testUnidecode() {
+
+ assertEquals("Liu Ben Mu hiruzuSen tawa", Unidecode.decode("六本木ヒルズ森タワ"));
+ assertEquals("Nan Wu A Mi Tuo Fo", Unidecode.decode("南无阿弥陀佛"));
+ assertEquals("Yi Tiao Hui Zou Lu De Yu", Unidecode.decode("一条会走路的鱼"));
+ assertEquals("amidaniyorai", Unidecode.decode("あみだにょらい"));
+ assertEquals("T`owrk`iayi", Unidecode.decode("Թուրքիայի"));
+ assertEquals("Obzor tematiki", Unidecode.decode("Обзор тематики"));
+ assertEquals("GERMANSKIE IaZYKI", Unidecode.decode("ГЕРМАНСКИЕ ЯЗЫКИ"));
+ assertEquals("Diereunese tes ikanopoieses", Unidecode.decode("Διερεύνηση της ικανοποίησης"));
+ assertEquals("lqDy l'wly@", Unidecode.decode("القضايا الأولية"));
+ assertEquals("abc def ghi", Unidecode.decode("abc def ghi"));
+ }
+
+ @Test
+ void testDateValidation() {
+
+ assertNotNull(GraphCleaningFunctions.cleanDate("2016-05-07T12:41:19.202Z "));
+ assertNotNull(GraphCleaningFunctions.cleanDate("2020-09-10 11:08:52 "));
+ assertNotNull(GraphCleaningFunctions.cleanDate(" 2016-04-05"));
+
+ assertEquals("2016-04-05", GraphCleaningFunctions.cleanDate("2016 Apr 05"));
+
+ assertEquals("2009-05-08", GraphCleaningFunctions.cleanDate("May 8, 2009 5:57:51 PM"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("oct 7, 1970"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("oct 7, '70"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("oct. 7, 1970"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("oct. 7, 70"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("Mon Jan 2 15:04:05 2006"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("Mon Jan 2 15:04:05 MST 2006"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("Mon Jan 02 15:04:05 -0700 2006"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("Monday, 02-Jan-06 15:04:05 MST"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("Mon, 02 Jan 2006 15:04:05 MST"));
+ assertEquals("2017-07-11", GraphCleaningFunctions.cleanDate("Tue, 11 Jul 2017 16:28:13 +0200 (CEST)"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("Mon, 02 Jan 2006 15:04:05 -0700"));
+ assertEquals("2018-01-04", GraphCleaningFunctions.cleanDate("Thu, 4 Jan 2018 17:53:36 +0000"));
+ assertEquals("2015-08-10", GraphCleaningFunctions.cleanDate("Mon Aug 10 15:44:11 UTC+0100 2015"));
+ assertEquals(
+ "2015-07-03",
+ GraphCleaningFunctions.cleanDate("Fri Jul 03 2015 18:04:07 GMT+0100 (GMT Daylight Time)"));
+ assertEquals("2012-09-17", GraphCleaningFunctions.cleanDate("September 17, 2012 10:09am"));
+ assertEquals("2012-09-17", GraphCleaningFunctions.cleanDate("September 17, 2012 at 10:09am PST-08"));
+ assertEquals("2012-09-17", GraphCleaningFunctions.cleanDate("September 17, 2012, 10:10:09"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("October 7, 1970"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("October 7th, 1970"));
+ assertEquals("2006-02-12", GraphCleaningFunctions.cleanDate("12 Feb 2006, 19:17"));
+ assertEquals("2006-02-12", GraphCleaningFunctions.cleanDate("12 Feb 2006 19:17"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("7 oct 70"));
+ assertEquals("1970-10-07", GraphCleaningFunctions.cleanDate("7 oct 1970"));
+ assertEquals("2013-02-03", GraphCleaningFunctions.cleanDate("03 February 2013"));
+ assertEquals("2013-07-01", GraphCleaningFunctions.cleanDate("1 July 2013"));
+ assertEquals("2013-02-03", GraphCleaningFunctions.cleanDate("2013-Feb-03"));
+ assertEquals("2014-03-31", GraphCleaningFunctions.cleanDate("3/31/2014"));
+ assertEquals("2014-03-31", GraphCleaningFunctions.cleanDate("03/31/2014"));
+ assertEquals("1971-08-21", GraphCleaningFunctions.cleanDate("08/21/71"));
+ assertEquals("1971-01-08", GraphCleaningFunctions.cleanDate("8/1/71"));
+ assertEquals("2014-08-04", GraphCleaningFunctions.cleanDate("4/8/2014 22:05"));
+ assertEquals("2014-08-04", GraphCleaningFunctions.cleanDate("04/08/2014 22:05"));
+ assertEquals("2014-08-04", GraphCleaningFunctions.cleanDate("4/8/14 22:05"));
+ assertEquals("2014-02-04", GraphCleaningFunctions.cleanDate("04/2/2014 03:00:51"));
+ assertEquals("1965-08-08", GraphCleaningFunctions.cleanDate("8/8/1965 12:00:00 AM"));
+ assertEquals("1965-08-08", GraphCleaningFunctions.cleanDate("8/8/1965 01:00:01 PM"));
+ assertEquals("1965-08-08", GraphCleaningFunctions.cleanDate("8/8/1965 01:00 PM"));
+ assertEquals("1965-08-08", GraphCleaningFunctions.cleanDate("8/8/1965 1:00 PM"));
+ assertEquals("1965-08-08", GraphCleaningFunctions.cleanDate("8/8/1965 12:00 AM"));
+ assertEquals("2014-02-04", GraphCleaningFunctions.cleanDate("4/02/2014 03:00:51"));
+ assertEquals("2012-03-19", GraphCleaningFunctions.cleanDate("03/19/2012 10:11:59"));
+ assertEquals("2012-03-19", GraphCleaningFunctions.cleanDate("03/19/2012 10:11:59.3186369"));
+ assertEquals("2014-03-31", GraphCleaningFunctions.cleanDate("2014/3/31"));
+ assertEquals("2014-03-31", GraphCleaningFunctions.cleanDate("2014/03/31"));
+ assertEquals("2014-04-08", GraphCleaningFunctions.cleanDate("2014/4/8 22:05"));
+ assertEquals("2014-04-08", GraphCleaningFunctions.cleanDate("2014/04/08 22:05"));
+ assertEquals("2014-04-02", GraphCleaningFunctions.cleanDate("2014/04/2 03:00:51"));
+ assertEquals("2014-04-02", GraphCleaningFunctions.cleanDate("2014/4/02 03:00:51"));
+ assertEquals("2012-03-19", GraphCleaningFunctions.cleanDate("2012/03/19 10:11:59"));
+ assertEquals("2012-03-19", GraphCleaningFunctions.cleanDate("2012/03/19 10:11:59.3186369"));
+ assertEquals("2014-04-08", GraphCleaningFunctions.cleanDate("2014年04月08日"));
+ assertEquals("2006-01-02", GraphCleaningFunctions.cleanDate("2006-01-02T15:04:05+0000"));
+ assertEquals("2009-08-13", GraphCleaningFunctions.cleanDate("2009-08-12T22:15:09-07:00"));
+ assertEquals("2009-08-12", GraphCleaningFunctions.cleanDate("2009-08-12T22:15:09"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26 17:24:37.3186369"));
+ assertEquals("2012-08-03", GraphCleaningFunctions.cleanDate("2012-08-03 18:31:59.257000000"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26 17:24:37.123"));
+ assertEquals("2013-04-01", GraphCleaningFunctions.cleanDate("2013-04-01 22:43"));
+ assertEquals("2013-04-01", GraphCleaningFunctions.cleanDate("2013-04-01 22:43:22"));
+ assertEquals("2014-12-16", GraphCleaningFunctions.cleanDate("2014-12-16 06:20:00 UTC"));
+ assertEquals("2014-12-16", GraphCleaningFunctions.cleanDate("2014-12-16 06:20:00 GMT"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26 05:24:37 PM"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26 13:13:43 +0800"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26 13:13:43 +0800 +08"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26 13:13:44 +09:00"));
+ assertEquals("2012-08-03", GraphCleaningFunctions.cleanDate("2012-08-03 18:31:59.257000000 +0000 UTC"));
+ assertEquals("2015-09-30", GraphCleaningFunctions.cleanDate("2015-09-30 18:48:56.35272715 +0000 UTC"));
+ assertEquals("2015-02-18", GraphCleaningFunctions.cleanDate("2015-02-18 00:12:00 +0000 GMT"));
+ assertEquals("2015-02-18", GraphCleaningFunctions.cleanDate("2015-02-18 00:12:00 +0000 UTC"));
+ assertEquals(
+ "2015-02-08", GraphCleaningFunctions.cleanDate("2015-02-08 03:02:00 +0300 MSK m=+0.000000001"));
+ assertEquals(
+ "2015-02-08", GraphCleaningFunctions.cleanDate("2015-02-08 03:02:00.001 +0300 MSK m=+0.000000001"));
+ assertEquals("2017-07-19", GraphCleaningFunctions.cleanDate("2017-07-19 03:21:51+00:00"));
+ assertEquals("2014-04-26", GraphCleaningFunctions.cleanDate("2014-04-26"));
+ assertEquals("2014-04-01", GraphCleaningFunctions.cleanDate("2014-04"));
+ assertEquals("2014-01-01", GraphCleaningFunctions.cleanDate("2014"));
+ assertEquals("2014-05-11", GraphCleaningFunctions.cleanDate("2014-05-11 08:20:13,787"));
+ assertEquals("2014-03-31", GraphCleaningFunctions.cleanDate("3.31.2014"));
+ assertEquals("2014-03-31", GraphCleaningFunctions.cleanDate("03.31.2014"));
+ assertEquals("1971-08-21", GraphCleaningFunctions.cleanDate("08.21.71"));
+ assertEquals("2014-03-01", GraphCleaningFunctions.cleanDate("2014.03"));
+ assertEquals("2014-03-30", GraphCleaningFunctions.cleanDate("2014.03.30"));
+ assertEquals("2014-06-01", GraphCleaningFunctions.cleanDate("20140601"));
+ assertEquals("2014-07-22", GraphCleaningFunctions.cleanDate("20140722105203"));
+ assertEquals("2012-03-19", GraphCleaningFunctions.cleanDate("1332151919"));
+ assertEquals("2013-11-12", GraphCleaningFunctions.cleanDate("1384216367189"));
+ assertEquals("2013-11-12", GraphCleaningFunctions.cleanDate("1384216367111222"));
+ assertEquals("2013-11-12", GraphCleaningFunctions.cleanDate("1384216367111222333"));
+
+ }
+
+ @Test
+ void testDate() {
+ final String date = GraphCleaningFunctions.cleanDate("23-FEB-1998");
+ assertNotNull(date);
+ System.out.println(date);
+ }
+
+ @Test
+ void testMergePubs() throws IOException {
+ Publication p1 = read("publication_1.json", Publication.class);
+ Publication p2 = read("publication_2.json", Publication.class);
+ Dataset d1 = read("dataset_1.json", Dataset.class);
+ Dataset d2 = read("dataset_2.json", Dataset.class);
+
+ assertEquals(1, p1.getCollectedfrom().size());
+ assertEquals(ModelConstants.CROSSREF_ID, p1.getCollectedfrom().get(0).getKey());
+ assertEquals(1, d2.getCollectedfrom().size());
+ assertFalse(cfId(d2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+
+ assertEquals(
+ ModelConstants.PUBLICATION_RESULTTYPE_CLASSID,
+ OafMapperUtils
+ .mergeResults(p1, d2)
+ .getResulttype()
+ .getClassid());
+
+ assertEquals(1, p2.getCollectedfrom().size());
+ assertFalse(cfId(p2.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+ assertEquals(1, d1.getCollectedfrom().size());
+ assertTrue(cfId(d1.getCollectedfrom()).contains(ModelConstants.CROSSREF_ID));
+
+ assertEquals(
+ ModelConstants.DATASET_RESULTTYPE_CLASSID,
+ OafMapperUtils
+ .mergeResults(p2, d1)
+ .getResulttype()
+ .getClassid());
+ }
+
+ @Test
+ void testDelegatedAuthority() throws IOException {
+ Dataset d1 = read("dataset_2.json", Dataset.class);
+ Dataset d2 = read("dataset_delegated.json", Dataset.class);
+
+ assertEquals(1, d2.getCollectedfrom().size());
+ assertTrue(cfId(d2.getCollectedfrom()).contains(ModelConstants.ZENODO_OD_ID));
+
+ Result res = OafMapperUtils.mergeResults(d1, d2);
+
+ assertEquals(d2, res);
+
+ System.out.println(OBJECT_MAPPER.writeValueAsString(res));
+
+ }
+
+ protected HashSet cfId(List collectedfrom) {
+ return collectedfrom.stream().map(KeyValue::getKey).collect(Collectors.toCollection(HashSet::new));
+ }
+
+ protected T read(String filename, Class clazz) throws IOException {
+ final String json = IOUtils.toString(getClass().getResourceAsStream(filename));
+ return OBJECT_MAPPER.readValue(json, clazz);
+ }
+
+}
diff --git a/dhp-common/src/test/java/eu/dnetlib/message/MessageTest.java b/dhp-common/src/test/java/eu/dnetlib/message/MessageTest.java
deleted file mode 100644
index 442f7b5c2..000000000
--- a/dhp-common/src/test/java/eu/dnetlib/message/MessageTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-
-package eu.dnetlib.message;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.jupiter.api.Test;
-
-public class MessageTest {
-
- @Test
- public void fromJsonTest() throws IOException {
- Message m = new Message();
- m.setWorkflowId("wId");
- m.setType(MessageType.ONGOING);
- m.setJobName("Collection");
- Map body = new HashMap<>();
- body.put("parsedItem", "300");
- body.put("ExecutionTime", "30s");
-
- m.setBody(body);
- System.out.println("m = " + m);
- Message m1 = Message.fromJson(m.toString());
- assertEquals(m1.getWorkflowId(), m.getWorkflowId());
- assertEquals(m1.getType(), m.getType());
- assertEquals(m1.getJobName(), m.getJobName());
-
- assertNotNull(m1.getBody());
- m1.getBody().keySet().forEach(it -> assertEquals(m1.getBody().get(it), m.getBody().get(it)));
- assertEquals(m1.getJobName(), m.getJobName());
- }
-
- @Test
- public void toStringTest() {
- final String expectedJson = "{\"workflowId\":\"wId\",\"jobName\":\"Collection\",\"type\":\"ONGOING\",\"body\":{\"ExecutionTime\":\"30s\",\"parsedItem\":\"300\"}}";
- Message m = new Message();
- m.setWorkflowId("wId");
- m.setType(MessageType.ONGOING);
- m.setJobName("Collection");
- Map body = new HashMap<>();
- body.put("parsedItem", "300");
- body.put("ExecutionTime", "30s");
-
- m.setBody(body);
-
- assertEquals(expectedJson, m.toString());
- }
-}
diff --git a/dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java b/dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java
index d1d1ada71..5743b0831 100644
--- a/dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java
+++ b/dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java
@@ -3,10 +3,10 @@ package eu.dnetlib.scholexplorer.relation;
import org.junit.jupiter.api.Test;
-public class RelationMapperTest {
+class RelationMapperTest {
@Test
- public void testLoadRels() throws Exception {
+ void testLoadRels() throws Exception {
RelationMapper relationMapper = RelationMapper.load();
relationMapper.keySet().forEach(System.out::println);
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/oa/merge/publications_with_authors.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/oa/merge/publications_with_authors.json
new file mode 100644
index 000000000..600181ba5
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/oa/merge/publications_with_authors.json
@@ -0,0 +1,3 @@
+{ "journal":{ "dataInfo":null, "conferenceplace":null, "issnPrinted":"0009-9260", "issnOnline":null, "issnLinking":null, "ep":"636", "iss":null, "sp":"632", "vol":"55", "edition":null, "conferencedate":null, "name":"Clinical Radiology" }, "measures":null, "author":[ { "rank":null, "fullname":"KARL TURETSCHEK", "affiliation":null, "pid":null, "surname":"TURETSCHEK", "name":"KARL" }, { "rank":null, "fullname":"WOLFGANG EBNER", "affiliation":null, "pid":null, "surname":"EBNER", "name":"WOLFGANG" }, { "rank":null, "fullname":"DOMINIK FLEISCHMANN", "affiliation":null, "pid":null, "surname":"FLEISCHMANN", "name":"DOMINIK" }, { "rank":null, "fullname":"PATRICK WUNDERBALDINGER", "affiliation":null, "pid":null, "surname":"WUNDERBALDINGER", "name":"PATRICK" }, { "rank":null, "fullname":"LUDWIG ERLACHER", "affiliation":null, "pid":null, "surname":"ERLACHER", "name":"LUDWIG" }, { "rank":null, "fullname":"THOMAS ZONTSICH", "affiliation":null, "pid":null, "surname":"ZONTSICH", "name":"THOMAS" }, { "rank":null, "fullname":"ALEXANDER A. BANKIER", "affiliation":null, "pid":null, "surname":"BANKIER", "name":"ALEXANDER A." } ], "resulttype":{ "classid":"publication", "schemeid":"dnet:result_typologies", "schemename":"dnet:result_typologies", "classname":"publication"}, "title":[ { "qualifier":{ "classid":"main title", "schemeid":"dnet:dataCite_title", "schemename":"dnet:dataCite_title", "classname":"main title" }, "dataInfo":null, "value":"Early Pulmonary Involvement in Ankylosing Spondylitis: Assessment With Thin-section CT" } ], "relevantdate":[ { "qualifier":{ "classid":"created", "schemeid":"dnet:dataCite_date", "schemename":"dnet:dataCite_date", "classname":"created" }, "dataInfo":null, "value":"2002-09-19T13:54:50Z" } ], "dateofacceptance":{ "dataInfo":null, "value":"2002-09-19T13:54:50Z" }, "publisher":{ "dataInfo":null, "value":"Elsevier BV" }, "embargoenddate":null, "fulltext":null, "contributor":null, "resourcetype":{ "classid":"0001", "schemeid":"dnet:dataCite_resource", "schemename":"dnet:dataCite_resource", "classname":"0001"}, "coverage":null, "bestaccessright":null, "externalReference":null, "format":null, "description":[ ], "source":[ { "dataInfo":null, "value":"Crossref" } ], "subject":[ { "qualifier":{ "classid":"keywords", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"keywords" }, "dataInfo":null, "value":"Radiology Nuclear Medicine and imaging" }, { "qualifier":{ "classid":"keywords", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"keywords" }, "dataInfo":null, "value":"General Medicine" } ], "language":null, "instance":[ { "processingchargecurrency":null, "refereed":null, "instancetype":{ "classid":"0001", "schemeid":"dnet:publication_resource", "schemename":"dnet:publication_resource", "classname":"Article" }, "hostedby":null, "distributionlocation":null, "processingchargeamount":null, "license":{ "dataInfo":null, "value":"https://www.elsevier.com/tdm/userlicense/1.0/" }, "accessright":{ "classid":"RESTRICTED", "schemeid":"dnet:access_modes", "schemename":"dnet:access_modes", "classname":"Restricted" }, "dateofacceptance":{ "dataInfo":null, "value":"2002-09-19T13:54:50Z" }, "collectedfrom":{ "dataInfo":null, "value":"Crossref", "key":"10|openaire____::081b82f96300b6a6e3d282bad31cb6e2" }, "url":[ "https://api.elsevier.com/content/article/PII:S0009926000904987?httpAccept=text/xml", "https://api.elsevier.com/content/article/PII:S0009926000904987?httpAccept=text/plain", "http://dx.doi.org/10.1053/crad.2000.0498" ] } ], "context":null, "country":null, "originalId":[ "S0009926000904987", "10.1053/crad.2000.0498" ], "pid":[ { "qualifier":{ "classid":"doi", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"doi" }, "dataInfo":null, "value":"10.1053/crad.2000.0498" } ], "dateofcollection":"2020-02-06T20:40:22Z", "dateoftransformation":null, "oaiprovenance":null, "extraInfo":null, "id":"50|doiboost____::994b7e47b9e225ab6d5e14841cb45a7f", "collectedfrom":[ { "dataInfo":null, "value":"Crossref", "key":"10|openaire____::081b82f96300b6a6e3d282bad31cb6e2" } ], "dataInfo":{ "trust":"0.9", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "lastupdatetimestamp":1581021622595 }
+{ "journal":null, "measures":null, "author":[ { "rank":null, "fullname":"Dominik Fleischmann", "affiliation":null, "pid":[ { "qualifier":{ "classid":"ORCID", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"ORCID" }, "dataInfo":{ "trust":"0.91", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:crosswalk:entityregistry", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"Harvested"} }, "value":"0000-0003-0715-0952" } ], "surname":"Fleischmann", "name":"Dominik" } ], "resulttype":{ "classid":"publication", "schemeid":"dnet:result_typologies", "schemename":"dnet:result_typologies", "classname":"publication"}, "title":[ ], "relevantdate":[ ], "dateofacceptance":null, "publisher":null, "embargoenddate":null, "fulltext":[ ], "contributor":[ ], "resourcetype":null, "coverage":[ ], "bestaccessright":null, "externalReference":[ ], "format":[ ], "description":null, "source":[ ], "subject":[ ], "language":null, "instance":[ ], "context":[ ], "country":[ ], "originalId":[ ], "pid":[ { "qualifier":{ "classid":"doi", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"doi"}, "dataInfo":null, "value":"10.1053/crad.2000.0498" } ], "dateofcollection":null, "dateoftransformation":null, "oaiprovenance":null, "extraInfo":[ ], "id":"50|doiboost____::994b7e47b9e225ab6d5e14841cb45a7f", "collectedfrom":[ { "dataInfo":null, "value":"ORCID", "key":"10|openaire____::806360c771262b4d6770e7cdf04b5c5a" } ], "dataInfo":{ "trust":"0.9", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "lastupdatetimestamp":null }
+{ "journal":{ "dataInfo":null, "conferenceplace":null, "issnPrinted":"0009-9260", "issnOnline":null, "issnLinking":null, "ep":"636", "iss":"8", "sp":"632", "vol":"55", "edition":null, "conferencedate":null, "name":"Clinical Radiology" }, "measures":null, "author":[ { "rank":null, "fullname":"T. Zontsich", "affiliation":[ { "dataInfo":null, "value":"University of Vienna" } ], "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL"}, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/1966908432" } ], "surname":null, "name":null }, { "rank":null, "fullname":"L Erlacher", "affiliation":[ { "dataInfo":null, "value":"University of Vienna" } ], "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL"}, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/687931320" } ], "surname":null, "name":null }, { "rank":null, "fullname":"Dominik Fleischmann", "affiliation":[ { "dataInfo":null, "value":"University of Vienna" } ], "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL"}, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/2156559961" } ], "surname":null, "name":null }, { "rank":null, "fullname":"Alexander A. Bankier", "affiliation":[ { "dataInfo":null, "value":"University of Vienna" } ], "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL"}, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/1107971609" } ], "surname":null, "name":null }, { "rank":null, "fullname":"Patrick Wunderbaldinger", "affiliation":[ { "dataInfo":null, "value":"University of Vienna" } ], "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL" }, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/2422340537" } ], "surname":null, "name":null }, { "rank":null, "fullname":"Wolfgang Ebner", "affiliation":null, "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL" }, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/2186462571" } ], "surname":null, "name":null }, { "rank":null, "fullname":"K. Turetschek", "affiliation":[ { "dataInfo":null, "value":"University of Vienna" } ], "pid":[ { "qualifier":{ "classid":"URL", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"URL" }, "dataInfo":null, "value":"https://academic.microsoft.com/#/detail/321765676" } ], "surname":null, "name":null } ], "resulttype":{ "classid":"publication", "schemeid":"dnet:result_typologies", "schemename":"dnet:result_typologies", "classname":"publication" }, "title":[ { "qualifier":{ "classid":"main title", "schemeid":"dnet:dataCite_title", "schemename":"dnet:dataCite_title", "classname":"main title" }, "dataInfo":null, "value":"early pulmonary involvement in ankylosing spondylitis assessment with thin section ct" }, { "qualifier":{ "classid":"alternative title", "schemeid":"dnet:dataCite_title", "schemename":"dnet:dataCite_title", "classname":"alternative title" }, "dataInfo":null, "value":"Early pulmonary involvement in ankylosing spondylitis: assessment with thin-section CT." } ], "relevantdate":null, "dateofacceptance":{ "dataInfo":null, "value":"2000-08-01" }, "publisher":{ "dataInfo":null, "value":"Elsevier" }, "embargoenddate":null, "fulltext":null, "contributor":null, "resourcetype":null, "coverage":null, "bestaccessright":null, "externalReference":null, "format":null, "description":[ { "dataInfo":null, "value":"Abstract AIM: To determine the frequency and the distribution of early pulmonary lesions in patients with ankylosing spondylitis (AS) and a normal chest X-ray on thin-section CT and to correlate the CT findings with the results of pulmonary function tests and clinical data. MATERIALS AND METHODS: Twenty-five patients with clinically proven AS and no history of smoking underwent clinical examinations, pulmonary function tests (PFT), chest radiography, and thin-section CT. Four of 25 patients (16%), who had obvious signs on plain films suggestive of pre-existing disorders unrelated to AS were excluded. RESULTS: Fifteen of 21 patients (71%) had abnormalities on thin-section CT. The most frequent abnormalities were thickening of the interlobular septa in seven of 21 patients (33%), mild bronchial wall thickening in (6/21, 29%), pleural thickening and pleuropulmonary irregularities (both 29%) and linear septal thickening (6/21, 29%). In six patients there were no signs of pleuropulmonary involvement. Eight of 15 patients (53%) with abnormal and four of six patients (67%) with normal CT findings revealed mild restrictive lung function impairment. CONCLUSION: Patients with AS but a normal chest radiograph frequently have abnormalities on thin-section CT. As these abnormalities are usually subtle and their extent does not correlate with functional and clinical data, the overall routine impact of thin-section CT in the diagnosis of AS is limited. Turetschek, K , (2000) Clinical Radiology53, 632–636." } ], "source":[ { "dataInfo":null, "value":null } ], "subject":[ { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Complication" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Chest radiograph" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.580897", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine.diagnostic_test" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.580897", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"In patient" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Radiography" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.4582326", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"business.industry" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.4582326", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"business" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Thin section ct" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Respiratory disease" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.49358836", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine.disease" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.49358836", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Ankylosing spondylitis" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.49937168", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine.disease" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.49937168", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Radiology" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.4573571", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine.medical_specialty" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.4573571", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"medicine" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Medicine" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.40295774", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"business.industry" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":{ "trust":"0.40295774", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset" } }, "value":"business" }, { "qualifier":{ "classid":"MAG", "schemeid":"dnet:subject_classification_typologies", "schemename":"dnet:subject_classification_typologies", "classname":"Microsoft Academic Graph classification" }, "dataInfo":null, "value":"Pulmonary function testing" } ], "language":null, "instance":[ { "processingchargecurrency":null, "refereed":null, "instancetype":null, "hostedby":null, "distributionlocation":null, "processingchargeamount":null, "license":null, "accessright":null, "dateofacceptance":null, "collectedfrom":{ "dataInfo":null, "value":"Microsoft Academic Graph", "key":"10|openaire____::5f532a3fc4f1ea403f37070f59a7a53a" }, "url":[ "https://www.ncbi.nlm.nih.gov/pubmed/10964736", "https://www.sciencedirect.com/science/article/pii/S0009926000904987", "https://academic.microsoft.com/#/detail/1990704599" ] } ], "context":null, "country":null, "originalId":[ "1990704599", "10.1053/crad.2000.0498" ], "pid":[ { "qualifier":{ "classid":"doi", "schemeid":"dnet:pid_types", "schemename":"dnet:pid_types", "classname":"doi" }, "dataInfo":null, "value":"10.1053/crad.2000.0498" } ], "dateofcollection":null, "dateoftransformation":null, "oaiprovenance":null, "extraInfo":null, "id":"50|doiboost____::994b7e47b9e225ab6d5e14841cb45a7f", "collectedfrom":[ { "dataInfo":null, "value":"Microsoft Academic Graph", "key":"10|openaire____::5f532a3fc4f1ea403f37070f59a7a53a" } ], "dataInfo":{ "trust":"0.9", "invisible":false, "inferred":false, "deletedbyinference":false, "inferenceprovenance":null, "provenanceaction":{ "classid":"sysimport:actionset", "schemeid":"dnet:provenanceActions", "schemename":"dnet:provenanceActions", "classname":"sysimport:actionset"} }, "lastupdatetimestamp":null }
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json
new file mode 100644
index 000000000..e38c4d1cc
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json
@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g", "resuttype" : { "classid" : "dataset" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2", "value" : "Crossref"} ]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json
new file mode 100644
index 000000000..c880edb7d
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json
@@ -0,0 +1,140 @@
+{
+ "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g",
+ "resuttype": {"classid": "dataset"},
+ "pid": [
+ {
+ "qualifier": {"classid": "doi"},
+ "value": "10.1016/j.cmet.2011.03.013"
+ },
+ {
+ "qualifier": {"classid": "urn"},
+ "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+ },
+ {
+ "qualifier": {"classid": "scp-number"},
+ "value": "79953761260"
+ },
+ {
+ "qualifier": {"classid": "pmc"},
+ "value": "21459329"
+ }
+ ],
+ "collectedfrom": [
+ {
+ "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3",
+ "value": "Repository B"
+ }
+ ],
+ "instance": [
+ {
+ "refereed": {
+ "classid": "0000",
+ "classname": "UNKNOWN",
+ "schemeid": "dnet:review_levels",
+ "schemename": "dnet:review_levels"
+ },
+ "hostedby": {
+ "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+ "value": "Zenodo"
+ },
+ "accessright": {
+ "classid": "OPEN",
+ "classname": "Open Access",
+ "schemeid": "dnet:access_modes",
+ "schemename": "dnet:access_modes"
+ },
+ "processingchargecurrency": {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "value": "EUR"
+ },
+ "pid": [
+ {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "qualifier": {
+ "classid": "doi",
+ "classname": "Digital Object Identifier",
+ "schemeid": "dnet:pid_types",
+ "schemename": "dnet:pid_types"
+ },
+ "value": "10.1371/journal.pone.0085605"
+ }
+ ],
+ "distributionlocation": "",
+ "url": ["https://doi.org/10.1371/journal.pone.0085605"],
+ "alternateIdentifier": [
+ {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "qualifier": {
+ "classid": "pmid",
+ "classname": "PubMed ID",
+ "schemeid": "dnet:pid_types",
+ "schemename": "dnet:pid_types"
+ },
+ "value": "24454899.0"
+ }
+ ],
+ "collectedfrom": {
+ "key": "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3",
+ "value": "Repository B"
+ },
+ "processingchargeamount": {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "value": "1022.02"
+ },
+ "instancetype": {
+ "classid": "0004",
+ "classname": "Conference object",
+ "schemeid": "dnet:publication_resource",
+ "schemename": "dnet:publication_resource"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_delegated.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_delegated.json
new file mode 100644
index 000000000..967c1181b
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_delegated.json
@@ -0,0 +1,140 @@
+{
+ "id": "50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1g",
+ "resuttype": {"classid": "dataset"},
+ "pid": [
+ {
+ "qualifier": {"classid": "doi"},
+ "value": "10.1016/j.cmet.2011.03.013"
+ },
+ {
+ "qualifier": {"classid": "urn"},
+ "value": "urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"
+ },
+ {
+ "qualifier": {"classid": "scp-number"},
+ "value": "79953761260"
+ },
+ {
+ "qualifier": {"classid": "pmc"},
+ "value": "21459329"
+ }
+ ],
+ "collectedfrom": [
+ {
+ "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+ "value": "Zenodo"
+ }
+ ],
+ "instance": [
+ {
+ "refereed": {
+ "classid": "0000",
+ "classname": "UNKNOWN",
+ "schemeid": "dnet:review_levels",
+ "schemename": "dnet:review_levels"
+ },
+ "hostedby": {
+ "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+ "value": "Zenodo"
+ },
+ "accessright": {
+ "classid": "OPEN",
+ "classname": "Open Access",
+ "schemeid": "dnet:access_modes",
+ "schemename": "dnet:access_modes"
+ },
+ "processingchargecurrency": {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "value": "EUR"
+ },
+ "pid": [
+ {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "qualifier": {
+ "classid": "doi",
+ "classname": "Digital Object Identifier",
+ "schemeid": "dnet:pid_types",
+ "schemename": "dnet:pid_types"
+ },
+ "value": "10.1371/journal.pone.0085605"
+ }
+ ],
+ "distributionlocation": "",
+ "url": ["https://doi.org/10.1371/journal.pone.0085605"],
+ "alternateIdentifier": [
+ {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "qualifier": {
+ "classid": "pmid",
+ "classname": "PubMed ID",
+ "schemeid": "dnet:pid_types",
+ "schemename": "dnet:pid_types"
+ },
+ "value": "24454899.0"
+ }
+ ],
+ "collectedfrom": {
+ "key": "10|opendoar____::358aee4cc897452c00244351e4d91f69",
+ "value": "Zenodo"
+ },
+ "processingchargeamount": {
+ "dataInfo": {
+ "provenanceaction": {
+ "classid": "sysimport:crosswalk:datasetarchive",
+ "classname": "Harvested",
+ "schemeid": "dnet:provenanceActions",
+ "schemename": "dnet:provenanceActions"
+ },
+ "deletedbyinference": false,
+ "inferred": false,
+ "inferenceprovenance": "",
+ "invisible": true,
+ "trust": "0.9"
+ },
+ "value": "1022.02"
+ },
+ "instancetype": {
+ "classid": "0004",
+ "classname": "Conference object",
+ "schemeid": "dnet:publication_resource",
+ "schemename": "dnet:publication_resource"
+ }
+ }
+ ]
+}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json
new file mode 100644
index 000000000..704c5ad4d
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json
@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", "resuttype" : { "classid" : "publication" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e2", "value" : "Crossref"} ]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_2.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_2.json
new file mode 100644
index 000000000..a1744e84e
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_2.json
@@ -0,0 +1 @@
+{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f", "resuttype" : { "classid" : "publication" }, "pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}], "collectedfrom" : [ { "key" : "10|openaire____::081b82f96300b6a6e3d282bad31cb6e3", "value" : "Repository A"} ]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_3.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_3.json
deleted file mode 100644
index 6d33568f4..000000000
--- a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_3.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[{"qualifier":{"classid":"scp-number"},"value":"79953761260"}]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_4.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_4.json
deleted file mode 100644
index 6617fe15f..000000000
--- a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_4.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_5.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_5.json
deleted file mode 100644
index 700a10046..000000000
--- a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f"}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi.json
deleted file mode 100644
index 6865d0ff6..000000000
--- a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_doi.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[{"qualifier":{"classid":"doi"},"value":"10.1016/j.cmet.2011.03.013"},{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_pmc.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_pmc.json
deleted file mode 100644
index 3e4ba2246..000000000
--- a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_pmc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmc"},"value":"21459329"}]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_urn.json b/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_urn.json
deleted file mode 100644
index 83e14e48d..000000000
--- a/dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_urn.json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"50|DansKnawCris::0829b5191605bdbea36d6502b8c1ce1f","pid":[{"qualifier":{"classid":"urn"},"value":"urn:nbn:nl:ui:29-f3ed5f9e-edf6-457e-8848-61b58a4075e2"},{"qualifier":{"classid":"scp-number"},"value":"79953761260"},{"qualifier":{"classid":"pmcid"},"value":"21459329"}]}
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt b/dhp-common/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt
new file mode 100644
index 000000000..729296522
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/transform/synonyms.txt
@@ -0,0 +1,1234 @@
+dnet:access_modes @=@ CLOSED @=@ http://purl.org/coar/access_right/c_14cb
+dnet:access_modes @=@ CLOSED @=@ info:eu-repo/semantics/closedAccess
+dnet:access_modes @=@ EMBARGO @=@ http://purl.org/coar/access_right/c_f1cf
+dnet:access_modes @=@ EMBARGO @=@ info:eu-repo/semantics/embargoedAccess
+dnet:access_modes @=@ OPEN @=@ Creative Commons License [CC BY-NC-ND] http://creativecommons.org/licenses/by-nc-nd/3.0/de/
+dnet:access_modes @=@ OPEN @=@ Creative commons
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by-nc-nd/3.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by-nc/3.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by-sa/3.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by-sa/4.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by/3.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by/3.0/us/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/licenses/by/4.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/publicdomain/zero/1.0/
+dnet:access_modes @=@ OPEN @=@ http://creativecommons.org/publicdomain/zero/1.0/ & http://www.canadensys.net/norms
+dnet:access_modes @=@ OPEN @=@ http://purl.org/coar/access_right/c_abf2
+dnet:access_modes @=@ OPEN @=@ https://creativecommons.org/licenses/by-nc/4.0/
+dnet:access_modes @=@ OPEN @=@ info:eu-repo/semantics/openAccess
+dnet:access_modes @=@ OPEN @=@ open_access
+dnet:access_modes @=@ RESTRICTED @=@ http://purl.org/coar/access_right/c_16ec
+dnet:access_modes @=@ RESTRICTED @=@ info:eu-repo/semantics/restrictedAccess
+dnet:compatibilityLevel @=@ openaire-pub_4.0 @=@ openaire4.0
+dnet:subject_classification_typologies @=@ jel @=@ jelElement
+dnet:publication_resource @=@ 0018 @=@ Comment/debate
+dnet:publication_resource @=@ 0018 @=@ http://purl.org/coar/resource_type/c_1162
+dnet:publication_resource @=@ 0018 @=@ info:eu-repo/semantics/annotation
+dnet:publication_resource @=@ 0001 @=@ A1 Alkuperäisartikkeli tieteellisessä aikakauslehdessä
+dnet:publication_resource @=@ 0001 @=@ Article
+dnet:publication_resource @=@ 0001 @=@ Article (author)
+dnet:publication_resource @=@ 0001 @=@ Article - letter to the editor
+dnet:publication_resource @=@ 0001 @=@ Article / Letter to editor
+dnet:publication_resource @=@ 0001 @=@ Article / Letter to the editor
+dnet:publication_resource @=@ 0001 @=@ Article / Newspaper
+dnet:publication_resource @=@ 0001 @=@ Article in journal
+dnet:publication_resource @=@ 0001 @=@ Article in monograph or in proceedings
+dnet:publication_resource @=@ 0001 @=@ Article in proceedings
+dnet:publication_resource @=@ 0001 @=@ Article-letter to the editor
+dnet:publication_resource @=@ 0001 @=@ Article/Letter to editor
+dnet:publication_resource @=@ 0001 @=@ Articolo
+dnet:publication_resource @=@ 0001 @=@ Artículo
+dnet:publication_resource @=@ 0001 @=@ Aufsatz
+dnet:publication_resource @=@ 0001 @=@ Clinical Study
+dnet:publication_resource @=@ 0001 @=@ Institutional Series
+dnet:publication_resource @=@ 0001 @=@ International Journal
+dnet:publication_resource @=@ 0001 @=@ International Journal Abstract
+dnet:publication_resource @=@ 0001 @=@ International Journal ISI/JCR
+dnet:publication_resource @=@ 0001 @=@ Journal (full / special issue)
+dnet:publication_resource @=@ 0001 @=@ Journal Article/Review
+dnet:publication_resource @=@ 0001 @=@ Journal article
+dnet:publication_resource @=@ 0001 @=@ Journal article (on-line or printed)
+dnet:publication_resource @=@ 0001 @=@ Journal articles
+dnet:publication_resource @=@ 0001 @=@ Journal paper
+dnet:publication_resource @=@ 0001 @=@ National Journal
+dnet:publication_resource @=@ 0001 @=@ Original article (non peer-reviewed)
+dnet:publication_resource @=@ 0001 @=@ Original article (peer-reviewed)
+dnet:publication_resource @=@ 0001 @=@ Peer-reviewed Article
+dnet:publication_resource @=@ 0001 @=@ Published Journal Article
+dnet:publication_resource @=@ 0001 @=@ Research Article
+dnet:publication_resource @=@ 0001 @=@ Review article (non peer-reviewed)
+dnet:publication_resource @=@ 0001 @=@ Review article (peer-reviewed)
+dnet:publication_resource @=@ 0001 @=@ Volumes Edited / Special Issues
+dnet:publication_resource @=@ 0001 @=@ article in non peer-reviewed journal
+dnet:publication_resource @=@ 0001 @=@ article in peer-reviewed journal
+dnet:publication_resource @=@ 0001 @=@ article-commentary
+dnet:publication_resource @=@ 0001 @=@ article_site_web
+dnet:publication_resource @=@ 0001 @=@ doc-type:Journal Article
+dnet:publication_resource @=@ 0001 @=@ doc-type:article
+dnet:publication_resource @=@ 0001 @=@ http://purl.org/coar/resource_type/c_2df8fbb1
+dnet:publication_resource @=@ 0001 @=@ http://purl.org/coar/resource_type/c_545b
+dnet:publication_resource @=@ 0001 @=@ http://purl.org/coar/resource_type/c_6501
+dnet:publication_resource @=@ 0001 @=@ http://purl.org/coar/resource_type/c_7877
+dnet:publication_resource @=@ 0001 @=@ in-brief
+dnet:publication_resource @=@ 0001 @=@ info:eu-repo/semantics/article
+dnet:publication_resource @=@ 0001 @=@ journal-article
+dnet:publication_resource @=@ 0001 @=@ journalArticle
+dnet:publication_resource @=@ 0001 @=@ journal_article
+dnet:publication_resource @=@ 0001 @=@ letter
+dnet:publication_resource @=@ 0001 @=@ non peer-reviewed article
+dnet:publication_resource @=@ 0001 @=@ partial-retraction
+dnet:publication_resource @=@ 0001 @=@ proceeding with peer review
+dnet:publication_resource @=@ 0001 @=@ publication-article
+dnet:publication_resource @=@ 0001 @=@ rapid-communication
+dnet:publication_resource @=@ 0001 @=@ reply
+dnet:publication_resource @=@ 0001 @=@ research-article
+dnet:publication_resource @=@ 0001 @=@ retraction
+dnet:publication_resource @=@ 0001 @=@ review-article
+dnet:publication_resource @=@ 0001 @=@ text (article)
+dnet:publication_resource @=@ 0001 @=@ Статья
+dnet:publication_resource @=@ 0001 @=@ ArticleArtikel
+dnet:publication_resource @=@ 0033 @=@ AUDIOVISUAL_DOCUMENT
+dnet:publication_resource @=@ 0033 @=@ Audiovisual/Audiovisual
+dnet:publication_resource @=@ 0033 @=@ http://purl.org/coar/resource_type/c_c513
+dnet:publication_resource @=@ 0008 @=@ Bachelor's
+dnet:publication_resource @=@ 0008 @=@ Bachelor's Degree
+dnet:publication_resource @=@ 0008 @=@ Bachelors Thesis
+dnet:publication_resource @=@ 0008 @=@ Proyecto fin de carrera
+dnet:publication_resource @=@ 0008 @=@ Undergraduate Thesis
+dnet:publication_resource @=@ 0008 @=@ http://purl.org/coar/resource_type/c_7a1f
+dnet:publication_resource @=@ 0008 @=@ info:eu-repo/semantics/bachelorThesis
+dnet:publication_resource @=@ 0008 @=@ выпускная бакалаврская работа
+dnet:publication_resource @=@ 0002 @=@ Book (monograph)
+dnet:publication_resource @=@ 0002 @=@ Book (non peer-reviewed)
+dnet:publication_resource @=@ 0002 @=@ Book (peer-reviewed)
+dnet:publication_resource @=@ 0002 @=@ Book - monograph - editorial book
+dnet:publication_resource @=@ 0002 @=@ Book Section
+dnet:publication_resource @=@ 0002 @=@ Book as author
+dnet:publication_resource @=@ 0002 @=@ Buch
+dnet:publication_resource @=@ 0002 @=@ International Book/Monograph
+dnet:publication_resource @=@ 0002 @=@ Libro
+dnet:publication_resource @=@ 0002 @=@ Monografia
+dnet:publication_resource @=@ 0002 @=@ Monograph
+dnet:publication_resource @=@ 0002 @=@ National Book/Monograph
+dnet:publication_resource @=@ 0002 @=@ atlas
+dnet:publication_resource @=@ 0002 @=@ book
+dnet:publication_resource @=@ 0002 @=@ book-series
+dnet:publication_resource @=@ 0002 @=@ book-set
+dnet:publication_resource @=@ 0002 @=@ book-track
+dnet:publication_resource @=@ 0002 @=@ book_series
+dnet:publication_resource @=@ 0002 @=@ book_title
+dnet:publication_resource @=@ 0002 @=@ doc-type:book
+dnet:publication_resource @=@ 0002 @=@ edited-book
+dnet:publication_resource @=@ 0002 @=@ http://purl.org/coar/resource_type/c_2f33
+dnet:publication_resource @=@ 0002 @=@ info:eu-repo/semantics/book
+dnet:publication_resource @=@ 0002 @=@ ouvrage
+dnet:publication_resource @=@ 0002 @=@ publication-book
+dnet:publication_resource @=@ 0002 @=@ reference-book
+dnet:publication_resource @=@ 0002 @=@ scientific book
+dnet:publication_resource @=@ 0002 @=@ Монография
+dnet:publication_resource @=@ 0002 @=@ Учебник
+dnet:publication_resource @=@ 0037 @=@ clinicalTrial
+dnet:publication_resource @=@ 0037 @=@ http://purl.org/coar/resource_type/c_cb28
+dnet:publication_resource @=@ 0022 @=@ collection
+dnet:publication_resource @=@ 0004 @=@ A4 Artikkeli konferenssijulkaisussa
+dnet:publication_resource @=@ 0004 @=@ Comunicación de congreso
+dnet:publication_resource @=@ 0004 @=@ Conference Paper
+dnet:publication_resource @=@ 0004 @=@ Conference Paper/Proceeding/Abstract
+dnet:publication_resource @=@ 0004 @=@ Conference Proceedings
+dnet:publication_resource @=@ 0004 @=@ Conference article
+dnet:publication_resource @=@ 0004 @=@ Conference contribution
+dnet:publication_resource @=@ 0004 @=@ Conference lecture
+dnet:publication_resource @=@ 0004 @=@ Conference or Workshop Item
+dnet:publication_resource @=@ 0004 @=@ Conference paper, poster, etc.
+dnet:publication_resource @=@ 0004 @=@ Conference papers
+dnet:publication_resource @=@ 0004 @=@ Conference report
+dnet:publication_resource @=@ 0004 @=@ International Conference
+dnet:publication_resource @=@ 0004 @=@ International Conference Abstract/Poster
+dnet:publication_resource @=@ 0004 @=@ International Conference ISI/JCR
+dnet:publication_resource @=@ 0004 @=@ International Conference communication/abstract/poster
+dnet:publication_resource @=@ 0004 @=@ National Conference
+dnet:publication_resource @=@ 0004 @=@ National Conference Abstract/Poster
+dnet:publication_resource @=@ 0004 @=@ National Conference communication/abstract/poster
+dnet:publication_resource @=@ 0004 @=@ PREFACE_PROCEEDINGS
+dnet:publication_resource @=@ 0004 @=@ PROCEEDING_PAPER
+dnet:publication_resource @=@ 0004 @=@ Papers in Conference Proceedings
+dnet:publication_resource @=@ 0004 @=@ Presentación
+dnet:publication_resource @=@ 0004 @=@ Proceedings (peer-reviewed)
+dnet:publication_resource @=@ 0004 @=@ Proceedings of a Conference
+dnet:publication_resource @=@ 0004 @=@ Proceedings paper
+dnet:publication_resource @=@ 0004 @=@ Póster
+dnet:publication_resource @=@ 0004 @=@ actes_congres
+dnet:publication_resource @=@ 0004 @=@ communication_avec_actes
+dnet:publication_resource @=@ 0004 @=@ communication_invitee
+dnet:publication_resource @=@ 0004 @=@ communication_par_affiche
+dnet:publication_resource @=@ 0004 @=@ communication_sans_actes
+dnet:publication_resource @=@ 0004 @=@ conference
+dnet:publication_resource @=@ 0004 @=@ conference item
+dnet:publication_resource @=@ 0004 @=@ conference proceeding
+dnet:publication_resource @=@ 0004 @=@ conferenceObject
+dnet:publication_resource @=@ 0004 @=@ conference_paper
+dnet:publication_resource @=@ 0004 @=@ doc-type:conferenceObject
+dnet:publication_resource @=@ 0004 @=@ http://purl.org/coar/resource_type/c_18co
+dnet:publication_resource @=@ 0004 @=@ http://purl.org/coar/resource_type/c_18cp
+dnet:publication_resource @=@ 0004 @=@ http://purl.org/coar/resource_type/c_5794
+dnet:publication_resource @=@ 0004 @=@ http://purl.org/coar/resource_type/c_6670
+dnet:publication_resource @=@ 0004 @=@ http://purl.org/coar/resource_type/c_c94f
+dnet:publication_resource @=@ 0004 @=@ http://purl.org/coar/resource_type/c_f744
+dnet:publication_resource @=@ 0004 @=@ info:eu-repo/semantics/conferenceItem
+dnet:publication_resource @=@ 0004 @=@ info:eu-repo/semantics/conferenceObject
+dnet:publication_resource @=@ 0004 @=@ invited conference talk
+dnet:publication_resource @=@ 0004 @=@ poster
+dnet:publication_resource @=@ 0004 @=@ presentation
+dnet:publication_resource @=@ 0004 @=@ proceeding, seminar, workshop without peer review
+dnet:publication_resource @=@ 0004 @=@ proceedings
+dnet:publication_resource @=@ 0004 @=@ proceedings-article
+dnet:publication_resource @=@ 0004 @=@ publication-conferencepaper
+dnet:publication_resource @=@ 0004 @=@ научный доклад
+dnet:publication_resource @=@ 0005 @=@ Newspaper or magazine article
+dnet:publication_resource @=@ 0005 @=@ http://purl.org/coar/resource_type/c_998f
+dnet:publication_resource @=@ 0005 @=@ info:eu-repo/semantics/contributionToPeriodical
+dnet:publication_resource @=@ 0045 @=@ Data Management Plan
+dnet:publication_resource @=@ 0045 @=@ Data Management Plan (NSF Generic)
+dnet:publication_resource @=@ 0045 @=@ http://purl.org/coar/resource_type/c_ab20
+dnet:publication_resource @=@ 0045 @=@ http://purl.org/spar/fabio/DataManagementPolicy
+dnet:publication_resource @=@ 0045 @=@ http://purl.org/spar/fabio/DataManagementPolicyDocument
+dnet:publication_resource @=@ 0045 @=@ http://purl.org/spar/fabio/DataMangementPlan
+dnet:publication_resource @=@ 0045 @=@ plan de gestión de datos
+dnet:publication_resource @=@ 0045 @=@ publication-datamanagementplan
+dnet:publication_resource @=@ 0031 @=@ Data Descriptor
+dnet:publication_resource @=@ 0031 @=@ DataPaper
+dnet:publication_resource @=@ 0031 @=@ data-article
+dnet:publication_resource @=@ 0031 @=@ http://purl.org/coar/resource_type/c_beb9
+dnet:publication_resource @=@ 0021 @=@ Dataset/Dataset
+dnet:publication_resource @=@ 0021 @=@ Research Data
+dnet:publication_resource @=@ 0021 @=@ dataset
+dnet:publication_resource @=@ 0021 @=@ http://purl.org/coar/resource_type/c_ddb1
+dnet:publication_resource @=@ 0021 @=@ info:eu-repo/semantics/DDIInstance
+dnet:publication_resource @=@ 0021 @=@ info:eu-repo/semantics/datafile
+dnet:publication_resource @=@ 0021 @=@ info:eu-repo/semantics/dataset
+dnet:publication_resource @=@ 0021 @=@ info:eu-repo/semantics/enhancedObjectFile
+dnet:publication_resource @=@ 0006 @=@ Diss
+dnet:publication_resource @=@ 0006 @=@ Dissertation
+dnet:publication_resource @=@ 0006 @=@ Doctoral
+dnet:publication_resource @=@ 0006 @=@ DoctoralThesis
+dnet:publication_resource @=@ 0006 @=@ PhD thesis
+dnet:publication_resource @=@ 0006 @=@ Tesis
+dnet:publication_resource @=@ 0006 @=@ Text.Thesis.Doctoral
+dnet:publication_resource @=@ 0006 @=@ Theses
+dnet:publication_resource @=@ 0006 @=@ Thesis
+dnet:publication_resource @=@ 0006 @=@ Thesis or Dissertation
+dnet:publication_resource @=@ 0006 @=@ Thesis.Doctoral
+dnet:publication_resource @=@ 0006 @=@ doc-type:doctoralThesis
+dnet:publication_resource @=@ 0006 @=@ http://purl.org/coar/resource_type/c_db06
+dnet:publication_resource @=@ 0006 @=@ info:eu-repo/semantics/doctoralThesis
+dnet:publication_resource @=@ 0006 @=@ publication-thesis
+dnet:publication_resource @=@ 0006 @=@ these
+dnet:publication_resource @=@ 0006 @=@ these exercice
+dnet:publication_resource @=@ 0023 @=@ Event/Event
+dnet:publication_resource @=@ 0023 @=@ event
+dnet:publication_resource @=@ 0009 @=@ Departmental Technical Report
+dnet:publication_resource @=@ 0009 @=@ Informe Técnico
+dnet:publication_resource @=@ 0009 @=@ RESEARCH_REPORT
+dnet:publication_resource @=@ 0009 @=@ Tech-Report
+dnet:publication_resource @=@ 0009 @=@ Technical Report
+dnet:publication_resource @=@ 0009 @=@ http://purl.org/coar/resource_type/c_18gh
+dnet:publication_resource @=@ 0009 @=@ publication-technicalnote
+dnet:publication_resource @=@ 0009 @=@ research report
+dnet:publication_resource @=@ 0024 @=@ Video
+dnet:publication_resource @=@ 0024 @=@ film
+dnet:publication_resource @=@ 0024 @=@ http://purl.org/coar/resource_type/c_12ce
+dnet:publication_resource @=@ 0024 @=@ http://purl.org/coar/resource_type/c_8a7e
+dnet:publication_resource @=@ 0025 @=@ Diagram
+dnet:publication_resource @=@ 0025 @=@ Drawing
+dnet:publication_resource @=@ 0025 @=@ Figure
+dnet:publication_resource @=@ 0025 @=@ Image/Image
+dnet:publication_resource @=@ 0025 @=@ Imagen
+dnet:publication_resource @=@ 0025 @=@ Photo
+dnet:publication_resource @=@ 0025 @=@ Plot
+dnet:publication_resource @=@ 0025 @=@ fotó
+dnet:publication_resource @=@ 0025 @=@ grafika
+dnet:publication_resource @=@ 0025 @=@ http://purl.org/coar/resource_type/c_ecc8
+dnet:publication_resource @=@ 0025 @=@ image
+dnet:publication_resource @=@ 0025 @=@ image-diagram
+dnet:publication_resource @=@ 0025 @=@ image-drawing
+dnet:publication_resource @=@ 0025 @=@ image-figure
+dnet:publication_resource @=@ 0025 @=@ image-other
+dnet:publication_resource @=@ 0025 @=@ image-photo
+dnet:publication_resource @=@ 0025 @=@ image-plot
+dnet:publication_resource @=@ 0026 @=@ http://purl.org/coar/resource_type/c_e9a0
+dnet:publication_resource @=@ 0026 @=@ interactiveResource
+dnet:publication_resource @=@ 0011 @=@ Internal note
+dnet:publication_resource @=@ 0011 @=@ http://purl.org/coar/resource_type/c_18ww
+dnet:publication_resource @=@ 0043 @=@ http://purl.org/coar/resource_type/c_0640
+dnet:publication_resource @=@ 0010 @=@ Inaugural lecture
+dnet:publication_resource @=@ 0010 @=@ Material didáctico
+dnet:publication_resource @=@ 0010 @=@ Public-Lecture
+dnet:publication_resource @=@ 0010 @=@ http://purl.org/coar/resource_type/c_8544
+dnet:publication_resource @=@ 0010 @=@ info:eu-repo/semantics/lecture
+dnet:publication_resource @=@ 0010 @=@ lesson
+dnet:publication_resource @=@ 0010 @=@ Учебный материал
+dnet:publication_resource @=@ 0007 @=@ Diploma Project
+dnet:publication_resource @=@ 0007 @=@ MSc Thesis
+dnet:publication_resource @=@ 0007 @=@ Master Degree
+dnet:publication_resource @=@ 0007 @=@ Master's
+dnet:publication_resource @=@ 0007 @=@ Masterarbeit u.a.
+dnet:publication_resource @=@ 0007 @=@ Masters (Taught)
+dnet:publication_resource @=@ 0007 @=@ Masters thesis
+dnet:publication_resource @=@ 0007 @=@ Masters-Thesis.Magister
+dnet:publication_resource @=@ 0007 @=@ Tesina
+dnet:publication_resource @=@ 0007 @=@ Thesis.Master
+dnet:publication_resource @=@ 0007 @=@ Trabajo fin de Máster
+dnet:publication_resource @=@ 0007 @=@ doc-type:masterThesis
+dnet:publication_resource @=@ 0007 @=@ hdr
+dnet:publication_resource @=@ 0007 @=@ http://purl.org/coar/resource_type/c_bdcc
+dnet:publication_resource @=@ 0007 @=@ info:eu-repo/semantics/masterThesis
+dnet:publication_resource @=@ 0007 @=@ masterThesis
+dnet:publication_resource @=@ 0007 @=@ memoire
+dnet:publication_resource @=@ 0027 @=@ Model/Model
+dnet:publication_resource @=@ 0027 @=@ model
+dnet:publication_resource @=@ 0020 @=@ Exhibition
+dnet:publication_resource @=@ 0020 @=@ Learning Object
+dnet:publication_resource @=@ 0020 @=@ Mapa
+dnet:publication_resource @=@ 0020 @=@ Modelo de utilidad
+dnet:publication_resource @=@ 0020 @=@ PEDAGOGICAL_DOCUMENT
+dnet:publication_resource @=@ 0020 @=@ Partitura
+dnet:publication_resource @=@ 0020 @=@ Sitio web
+dnet:publication_resource @=@ 0020 @=@ Trabajo de divulgación
+dnet:publication_resource @=@ 0020 @=@ Web publication/site
+dnet:publication_resource @=@ 0020 @=@ application
+dnet:publication_resource @=@ 0020 @=@ artefact
+dnet:publication_resource @=@ 0020 @=@ carte
+dnet:publication_resource @=@ 0020 @=@ composition
+dnet:publication_resource @=@ 0020 @=@ document_audiovisuel
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_12cc
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_12cd
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_1843
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_18cd
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_18cw
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_26e4
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_7ad9
+dnet:publication_resource @=@ 0020 @=@ http://purl.org/coar/resource_type/c_e059
+dnet:publication_resource @=@ 0020 @=@ info:eu-repo/semantics/other
+dnet:publication_resource @=@ 0020 @=@ learningObject
+dnet:publication_resource @=@ 0020 @=@ map
+dnet:publication_resource @=@ 0020 @=@ misc
+dnet:publication_resource @=@ 0020 @=@ other
+dnet:publication_resource @=@ 0020 @=@ revue
+dnet:publication_resource @=@ 0038 @=@ Abstract
+dnet:publication_resource @=@ 0038 @=@ Blog
+dnet:publication_resource @=@ 0038 @=@ Book Prospectus
+dnet:publication_resource @=@ 0038 @=@ Dictionary Entry
+dnet:publication_resource @=@ 0038 @=@ Disclosure
+dnet:publication_resource @=@ 0038 @=@ Editorial
+dnet:publication_resource @=@ 0038 @=@ Editorial ISI/JCR
+dnet:publication_resource @=@ 0038 @=@ Editors
+dnet:publication_resource @=@ 0038 @=@ Editors (non peer-reviewed)
+dnet:publication_resource @=@ 0038 @=@ Editors (peer-reviewed)
+dnet:publication_resource @=@ 0038 @=@ Encyclopedia Entry
+dnet:publication_resource @=@ 0038 @=@ Entrada de blog
+dnet:publication_resource @=@ 0038 @=@ Funding Submission
+dnet:publication_resource @=@ 0038 @=@ HabilitationThesis
+dnet:publication_resource @=@ 0038 @=@ License
+dnet:publication_resource @=@ 0038 @=@ Manual
+dnet:publication_resource @=@ 0038 @=@ Manuscript
+dnet:publication_resource @=@ 0038 @=@ Manuscrito
+dnet:publication_resource @=@ 0038 @=@ Other publication (non peer-review)
+dnet:publication_resource @=@ 0038 @=@ Other publication (peer-review)
+dnet:publication_resource @=@ 0038 @=@ Revista
+dnet:publication_resource @=@ 0038 @=@ Supervised Student Publication
+dnet:publication_resource @=@ 0038 @=@ Tesis/trabajos de grado – Thesis
+dnet:publication_resource @=@ 0038 @=@ Text
+dnet:publication_resource @=@ 0038 @=@ Text/Text
+dnet:publication_resource @=@ 0038 @=@ Trademark
+dnet:publication_resource @=@ 0038 @=@ Translation
+dnet:publication_resource @=@ 0038 @=@ afterword
+dnet:publication_resource @=@ 0038 @=@ avantpropos
+dnet:publication_resource @=@ 0038 @=@ bibliography
+dnet:publication_resource @=@ 0038 @=@ chronique
+dnet:publication_resource @=@ 0038 @=@ compte rendu
+dnet:publication_resource @=@ 0038 @=@ correction
+dnet:publication_resource @=@ 0038 @=@ foreword
+dnet:publication_resource @=@ 0038 @=@ habilitation à diriger des recherches
+dnet:publication_resource @=@ 0038 @=@ historicalDocument
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_0040
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_0857
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_18cf
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_18wz
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_3e5a
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_46ec
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_6947
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_7acd
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_86bc
+dnet:publication_resource @=@ 0038 @=@ http://purl.org/coar/resource_type/c_b239
+dnet:publication_resource @=@ 0038 @=@ note de lecture
+dnet:publication_resource @=@ 0038 @=@ notedelecture
+dnet:publication_resource @=@ 0038 @=@ other publication
+dnet:publication_resource @=@ 0038 @=@ postface
+dnet:publication_resource @=@ 0038 @=@ publication-other
+dnet:publication_resource @=@ 0038 @=@ revuedepresse
+dnet:publication_resource @=@ 0038 @=@ sa_component
+dnet:publication_resource @=@ 0038 @=@ standard
+dnet:publication_resource @=@ 0038 @=@ standard-series
+dnet:publication_resource @=@ 0013 @=@ A3 Kirjan tai muun kokoomateoksen osa
+dnet:publication_resource @=@ 0013 @=@ Book Part (author)
+dnet:publication_resource @=@ 0013 @=@ Book Section / Chapter
+dnet:publication_resource @=@ 0013 @=@ Book chapter or Essay in book
+dnet:publication_resource @=@ 0013 @=@ Book editorial
+dnet:publication_resource @=@ 0013 @=@ Book section
+dnet:publication_resource @=@ 0013 @=@ Book_Chapter
+dnet:publication_resource @=@ 0013 @=@ Buchbeitrag
+dnet:publication_resource @=@ 0013 @=@ Capítulo de libro
+dnet:publication_resource @=@ 0013 @=@ Contribution to International Book/Monograph
+dnet:publication_resource @=@ 0013 @=@ Contribution to International Book/Monograph ISI/JCR
+dnet:publication_resource @=@ 0013 @=@ Contribution to National Book/Monograph
+dnet:publication_resource @=@ 0013 @=@ Contribution to book (non peer-reviewed)
+dnet:publication_resource @=@ 0013 @=@ Contribution to book (peer-reviewed)
+dnet:publication_resource @=@ 0013 @=@ Part of book - chapter
+dnet:publication_resource @=@ 0013 @=@ book chapter
+dnet:publication_resource @=@ 0013 @=@ book-part
+dnet:publication_resource @=@ 0013 @=@ bookPart
+dnet:publication_resource @=@ 0013 @=@ book_content
+dnet:publication_resource @=@ 0013 @=@ chapitre_ouvrage
+dnet:publication_resource @=@ 0013 @=@ chapter
+dnet:publication_resource @=@ 0013 @=@ doc-type:bookPart
+dnet:publication_resource @=@ 0013 @=@ http://purl.org/coar/resource_type/c_3248
+dnet:publication_resource @=@ 0013 @=@ info:eu-repo/semantics/bookPart
+dnet:publication_resource @=@ 0013 @=@ publication-section
+dnet:publication_resource @=@ 0013 @=@ reference-entry
+dnet:publication_resource @=@ 0013 @=@ reference_entry
+dnet:publication_resource @=@ 0013 @=@ scientific book chapter
+dnet:publication_resource @=@ 0013 @=@ Глава монографии
+dnet:publication_resource @=@ 0019 @=@ H1 Myönnetty patentti
+dnet:publication_resource @=@ 0019 @=@ Patent
+dnet:publication_resource @=@ 0019 @=@ Patente
+dnet:publication_resource @=@ 0019 @=@ Solicitud de patente
+dnet:publication_resource @=@ 0019 @=@ Traducción de patente
+dnet:publication_resource @=@ 0019 @=@ brevet
+dnet:publication_resource @=@ 0019 @=@ http://purl.org/coar/resource_type/c_15cd
+dnet:publication_resource @=@ 0019 @=@ info:eu-repo/semantics/patent
+dnet:publication_resource @=@ 0019 @=@ publication-patent
+dnet:publication_resource @=@ 0028 @=@ Service
+dnet:publication_resource @=@ 0028 @=@ physicalObject
+dnet:publication_resource @=@ 0016 @=@ Pre Print
+dnet:publication_resource @=@ 0016 @=@ Pre-print
+dnet:publication_resource @=@ 0016 @=@ http://purl.org/coar/resource_type/c_816b
+dnet:publication_resource @=@ 0016 @=@ info:eu-repo/semantics/preprint
+dnet:publication_resource @=@ 0016 @=@ publication-preprint
+dnet:publication_resource @=@ 0016 @=@ Препринт
+dnet:publication_resource @=@ 0034 @=@ Project deliverable
+dnet:publication_resource @=@ 0034 @=@ http://purl.org/coar/resource_type/c_18op
+dnet:publication_resource @=@ 0034 @=@ publication-deliverable
+dnet:publication_resource @=@ 0035 @=@ Project milestone
+dnet:publication_resource @=@ 0035 @=@ publication-milestone
+dnet:publication_resource @=@ 0036 @=@ Proposal
+dnet:publication_resource @=@ 0036 @=@ http://purl.org/coar/resource_type/c_baaf
+dnet:publication_resource @=@ 0036 @=@ research-proposal
+dnet:publication_resource @=@ 0017 @=@ ACTIVITY_REPORT
+dnet:publication_resource @=@ 0017 @=@ Commissioned report
+dnet:publication_resource @=@ 0017 @=@ D4 Julkaistu kehittämis- tai tutkimusraportti tai -selvitys
+dnet:publication_resource @=@ 0017 @=@ Deliverable
+dnet:publication_resource @=@ 0017 @=@ Documento tecnico
+dnet:publication_resource @=@ 0017 @=@ Project Report
+dnet:publication_resource @=@ 0017 @=@ Software documentation
+dnet:publication_resource @=@ 0017 @=@ brief-report
+dnet:publication_resource @=@ 0017 @=@ case-report
+dnet:publication_resource @=@ 0017 @=@ chapitre_rapport
+dnet:publication_resource @=@ 0017 @=@ doc-type:report
+dnet:publication_resource @=@ 0017 @=@ document_institutionnel
+dnet:publication_resource @=@ 0017 @=@ document_technique
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_186u
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_18hj
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_18wq
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_18ws
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_71bd
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_93fc
+dnet:publication_resource @=@ 0017 @=@ http://purl.org/coar/resource_type/c_ba1f
+dnet:publication_resource @=@ 0017 @=@ info:eu-repo/semantics/report
+dnet:publication_resource @=@ 0017 @=@ publication-report
+dnet:publication_resource @=@ 0017 @=@ publication-softwaredocumentation
+dnet:publication_resource @=@ 0017 @=@ rapport_expertise
+dnet:publication_resource @=@ 0017 @=@ rapport_mission
+dnet:publication_resource @=@ 0017 @=@ report
+dnet:publication_resource @=@ 0017 @=@ report-paper
+dnet:publication_resource @=@ 0017 @=@ report-paper_title
+dnet:publication_resource @=@ 0017 @=@ report-series
+dnet:publication_resource @=@ 0017 @=@ support_cours
+dnet:publication_resource @=@ 0014 @=@ Arbeitspapier
+dnet:publication_resource @=@ 0014 @=@ Departmental Bulletin Paper
+dnet:publication_resource @=@ 0014 @=@ Documento de trabajo
+dnet:publication_resource @=@ 0014 @=@ Paper
+dnet:publication_resource @=@ 0014 @=@ Project description
+dnet:publication_resource @=@ 0014 @=@ Research-Paper
+dnet:publication_resource @=@ 0014 @=@ ResearchPaper
+dnet:publication_resource @=@ 0014 @=@ Working / discussion paper
+dnet:publication_resource @=@ 0014 @=@ Working Paper
+dnet:publication_resource @=@ 0014 @=@ Working Paper / Technical Report
+dnet:publication_resource @=@ 0014 @=@ doc-type:workingPaper
+dnet:publication_resource @=@ 0014 @=@ http://purl.org/coar/resource_type/c_8042
+dnet:publication_resource @=@ 0014 @=@ info:eu-repo/semantics/paper
+dnet:publication_resource @=@ 0014 @=@ info:eu-repo/semantics/workingPaper
+dnet:publication_resource @=@ 0014 @=@ publication-workingpaper
+dnet:publication_resource @=@ 0014 @=@ workingPaper
+dnet:publication_resource @=@ 0015 @=@ A2 Katsausartikkeli tieteellisessä aikakauslehdessä
+dnet:publication_resource @=@ 0015 @=@ Book Review
+dnet:publication_resource @=@ 0015 @=@ Book/Film/Article review
+dnet:publication_resource @=@ 0015 @=@ Literature review
+dnet:publication_resource @=@ 0015 @=@ Peer review
+dnet:publication_resource @=@ 0015 @=@ Reseña bibliográfica
+dnet:publication_resource @=@ 0015 @=@ Review Article
+dnet:publication_resource @=@ 0015 @=@ RezensionReview
+dnet:publication_resource @=@ 0015 @=@ book-review
+dnet:publication_resource @=@ 0015 @=@ http://purl.org/coar/resource_type/c_ba08
+dnet:publication_resource @=@ 0015 @=@ http://purl.org/coar/resource_type/c_dcae04bc
+dnet:publication_resource @=@ 0015 @=@ http://purl.org/coar/resource_type/c_efa0
+dnet:publication_resource @=@ 0015 @=@ info:eu-repo/semantics/review
+dnet:publication_resource @=@ 0015 @=@ peer-review
+dnet:publication_resource @=@ 0029 @=@ Software
+dnet:publication_resource @=@ 0029 @=@ Software/Software
+dnet:publication_resource @=@ 0029 @=@ Workflow
+dnet:publication_resource @=@ 0029 @=@ Workflow/Workflow
+dnet:publication_resource @=@ 0029 @=@ http://purl.org/coar/resource_type/c_393c
+dnet:publication_resource @=@ 0029 @=@ http://purl.org/coar/resource_type/c_5ce6
+dnet:publication_resource @=@ 0029 @=@ http://purl.org/coar/resource_type/c_c950
+dnet:publication_resource @=@ 0032 @=@ http://purl.org/coar/resource_type/c_7bab
+dnet:publication_resource @=@ 0030 @=@ http://purl.org/coar/resource_type/c_18cc
+dnet:publication_resource @=@ 0030 @=@ sound
+dnet:publication_resource @=@ 0044 @=@ Graduate diploma
+dnet:publication_resource @=@ 0044 @=@ Undergraduate diploma
+dnet:publication_resource @=@ 0000 @=@ UNKNOWN
+dnet:publication_resource @=@ 0042 @=@ EGI Virtual Appliance
+dnet:languages @=@ abk @=@ ab
+dnet:languages @=@ aar @=@ aa
+dnet:languages @=@ afr @=@ af
+dnet:languages @=@ alb/sqi @=@ sq
+dnet:languages @=@ amh @=@ am
+dnet:languages @=@ ara @=@ ar
+dnet:languages @=@ arm/hye @=@ hy
+dnet:languages @=@ asm @=@ as
+dnet:languages @=@ ina @=@ ia
+dnet:languages @=@ aym @=@ ay
+dnet:languages @=@ aze @=@ az
+dnet:languages @=@ bak @=@ ba
+dnet:languages @=@ baq/eus @=@ eu
+dnet:languages @=@ bel @=@ be
+dnet:languages @=@ ben @=@ bn
+dnet:languages @=@ bih @=@ bh
+dnet:languages @=@ bis @=@ bi
+dnet:languages @=@ bre @=@ br
+dnet:languages @=@ bul @=@ bg
+dnet:languages @=@ bur/mya @=@ my
+dnet:languages @=@ cat @=@ ca
+dnet:languages @=@ chi/zho @=@ zh
+dnet:languages @=@ cos @=@ co
+dnet:languages @=@ hrv @=@ hr
+dnet:languages @=@ hrv @=@ hr
+dnet:languages @=@ hrv @=@ scr/hrv
+dnet:languages @=@ ces/cze @=@ cs
+dnet:languages @=@ dan @=@ da
+dnet:languages @=@ dut/nld @=@ dut/nla
+dnet:languages @=@ dut/nld @=@ dutdut
+dnet:languages @=@ dut/nld @=@ nl
+dnet:languages @=@ dut/nld @=@ nl_be
+dnet:languages @=@ dut/nld @=@ nl_nl
+dnet:languages @=@ dut/nld @=@ nld
+dnet:languages @=@ dzo @=@ dz
+dnet:languages @=@ eng @=@ en
+dnet:languages @=@ eng @=@ en_au
+dnet:languages @=@ eng @=@ en_en
+dnet:languages @=@ eng @=@ en_gb
+dnet:languages @=@ eng @=@ en_nz
+dnet:languages @=@ eng @=@ en_us
+dnet:languages @=@ eng @=@ english
+dnet:languages @=@ eng @=@ en-us
+dnet:languages @=@ eng @=@ en-US
+dnet:languages @=@ eng @=@ English
+dnet:languages @=@ eng @=@ EN
+dnet:languages @=@ eng @=@ en angielski
+dnet:languages @=@ eng @=@ en-GB
+dnet:languages @=@ eng @=@ Englisch
+dnet:languages @=@ epo @=@ eo
+dnet:languages @=@ est @=@ et
+dnet:languages @=@ fao @=@ fo
+dnet:languages @=@ fij @=@ fj
+dnet:languages @=@ fin @=@ fi
+dnet:languages @=@ fin @=@ Finnish
+dnet:languages @=@ fra/fre @=@ fr
+dnet:languages @=@ fra/fre @=@ FR
+dnet:languages @=@ fra/fre @=@ fr_be
+dnet:languages @=@ fra/fre @=@ fr_fr
+dnet:languages @=@ fra/fre @=@ fre/fra
+dnet:languages @=@ fra/fre @=@ fra
+dnet:languages @=@ fry @=@ fy
+dnet:languages @=@ glg @=@ gl
+dnet:languages @=@ geo/kat @=@ ka
+dnet:languages @=@ deu/ger @=@ de
+dnet:languages @=@ deu/ger @=@ ger/deu
+dnet:languages @=@ deu/ger @=@ german
+dnet:languages @=@ deu/ger @=@ ger
+dnet:languages @=@ deu/ger @=@ deu
+dnet:languages @=@ deu/ger @=@ DE-de
+dnet:languages @=@ ell/gre @=@ el
+dnet:languages @=@ ell/gre @=@ gr
+dnet:languages @=@ ell/gre @=@ el-GR
+dnet:languages @=@ kal @=@ kl
+dnet:languages @=@ grn @=@ gn
+dnet:languages @=@ guj @=@ gu
+dnet:languages @=@ hau @=@ ha
+dnet:languages @=@ heb @=@ he
+dnet:languages @=@ hin @=@ hi
+dnet:languages @=@ hun @=@ hu
+dnet:languages @=@ ice/isl @=@ is
+dnet:languages @=@ ine @=@ -
+dnet:languages @=@ ind @=@ id
+dnet:languages @=@ iku @=@ iu
+dnet:languages @=@ ipk @=@ ik
+dnet:languages @=@ gai/iri @=@ ga
+dnet:languages @=@ gai/iri @=@ gle
+dnet:languages @=@ ita @=@ it
+dnet:languages @=@ jpn @=@ ja
+dnet:languages @=@ jav @=@ jv
+dnet:languages @=@ jav @=@ jv/jw
+dnet:languages @=@ jav @=@ jw
+dnet:languages @=@ kan @=@ kn
+dnet:languages @=@ kas @=@ ks
+dnet:languages @=@ kaz @=@ kk
+dnet:languages @=@ khm @=@ km
+dnet:languages @=@ kin @=@ rw
+dnet:languages @=@ kir @=@ ky
+dnet:languages @=@ kor @=@ ko
+dnet:languages @=@ kur @=@ ku
+dnet:languages @=@ lao @=@ lo
+dnet:languages @=@ lat @=@ la
+dnet:languages @=@ lav @=@ lv
+dnet:languages @=@ lin @=@ ln
+dnet:languages @=@ lit @=@ lt
+dnet:languages @=@ mac/mak @=@ mk
+dnet:languages @=@ mlg @=@ mg
+dnet:languages @=@ may/msa @=@ ms
+dnet:languages @=@ mlt @=@ ml
+dnet:languages @=@ mao/mri @=@ mi
+dnet:languages @=@ mar @=@ mr
+dnet:languages @=@ mol @=@ mo
+dnet:languages @=@ mon @=@ mn
+dnet:languages @=@ nau @=@ na
+dnet:languages @=@ nep @=@ ne
+dnet:languages @=@ nor @=@ no
+dnet:languages @=@ oci @=@ oc
+dnet:languages @=@ ori @=@ or
+dnet:languages @=@ orm @=@ om
+dnet:languages @=@ pan @=@ pa
+dnet:languages @=@ fas/per @=@ fa
+dnet:languages @=@ pol @=@ pl
+dnet:languages @=@ por @=@ pt
+dnet:languages @=@ por @=@ pt_pt
+dnet:languages @=@ pus @=@ ps
+dnet:languages @=@ que @=@ qu
+dnet:languages @=@ roh @=@ rm
+dnet:languages @=@ ron/rum @=@ ro
+dnet:languages @=@ run @=@ rn
+dnet:languages @=@ rus @=@ ru
+dnet:languages @=@ smo @=@ sm
+dnet:languages @=@ sag @=@ sg
+dnet:languages @=@ san @=@ sa
+dnet:languages @=@ srp @=@ scc/srp
+dnet:languages @=@ srp @=@ sr
+dnet:languages @=@ scr @=@ sh
+dnet:languages @=@ sna @=@ sn
+dnet:languages @=@ snd @=@ sd
+dnet:languages @=@ sin @=@ si
+dnet:languages @=@ sit @=@ -
+dnet:languages @=@ slk/slo @=@ sk
+dnet:languages @=@ slv @=@ sl
+dnet:languages @=@ som @=@ so
+dnet:languages @=@ sot @=@ st
+dnet:languages @=@ esl/spa @=@ es
+dnet:languages @=@ sun @=@ su
+dnet:languages @=@ swa @=@ sw
+dnet:languages @=@ ssw @=@ ss
+dnet:languages @=@ swe @=@ sv
+dnet:languages @=@ swe @=@ sve/swe
+dnet:languages @=@ tgl @=@ tl
+dnet:languages @=@ tgk @=@ tg
+dnet:languages @=@ tam @=@ ta
+dnet:languages @=@ tat @=@ tt
+dnet:languages @=@ tel @=@ te
+dnet:languages @=@ tha @=@ th
+dnet:languages @=@ tha @=@ thai
+dnet:languages @=@ bod/tib @=@ bo
+dnet:languages @=@ tir @=@ ti
+dnet:languages @=@ tog @=@ to
+dnet:languages @=@ tso @=@ ts
+dnet:languages @=@ tsn @=@ tn
+dnet:languages @=@ tur @=@ tr
+dnet:languages @=@ tuk @=@ tk
+dnet:languages @=@ twi @=@ tw
+dnet:languages @=@ uig @=@ ug
+dnet:languages @=@ ukr @=@ uk
+dnet:languages @=@ und @=@ UNKNOWN
+dnet:languages @=@ und @=@ none
+dnet:languages @=@ urd @=@ ur
+dnet:languages @=@ uzb @=@ uz
+dnet:languages @=@ vie @=@ vi
+dnet:languages @=@ vol @=@ vo
+dnet:languages @=@ wln @=@ wa
+dnet:languages @=@ cym/wel @=@ cy
+dnet:languages @=@ wol @=@ wo
+dnet:languages @=@ xho @=@ xh
+dnet:languages @=@ yid @=@ yi
+dnet:languages @=@ yor @=@ yo
+dnet:languages @=@ zha @=@ za
+dnet:languages @=@ zul @=@ zu
+dnet:result_typologies @=@ dataset @=@ 0021
+dnet:result_typologies @=@ dataset @=@ 0024
+dnet:result_typologies @=@ dataset @=@ 0025
+dnet:result_typologies @=@ dataset @=@ 0030
+dnet:result_typologies @=@ dataset @=@ 0033
+dnet:result_typologies @=@ dataset @=@ 0037
+dnet:result_typologies @=@ dataset @=@ 0039
+dnet:result_typologies @=@ dataset @=@ 0046
+dnet:result_typologies @=@ other @=@ 0000
+dnet:result_typologies @=@ other @=@ 0010
+dnet:result_typologies @=@ other @=@ 0018
+dnet:result_typologies @=@ other @=@ 0020
+dnet:result_typologies @=@ other @=@ 0022
+dnet:result_typologies @=@ other @=@ 0023
+dnet:result_typologies @=@ other @=@ 0026
+dnet:result_typologies @=@ other @=@ 0027
+dnet:result_typologies @=@ other @=@ 0028
+dnet:result_typologies @=@ other @=@ 0042
+dnet:result_typologies @=@ publication @=@ 0001
+dnet:result_typologies @=@ publication @=@ 0002
+dnet:result_typologies @=@ publication @=@ 0004
+dnet:result_typologies @=@ publication @=@ 0005
+dnet:result_typologies @=@ publication @=@ 0006
+dnet:result_typologies @=@ publication @=@ 0007
+dnet:result_typologies @=@ publication @=@ 0008
+dnet:result_typologies @=@ publication @=@ 0009
+dnet:result_typologies @=@ publication @=@ 0011
+dnet:result_typologies @=@ publication @=@ 0012
+dnet:result_typologies @=@ publication @=@ 0013
+dnet:result_typologies @=@ publication @=@ 0014
+dnet:result_typologies @=@ publication @=@ 0015
+dnet:result_typologies @=@ publication @=@ 0016
+dnet:result_typologies @=@ publication @=@ 0017
+dnet:result_typologies @=@ publication @=@ 0019
+dnet:result_typologies @=@ publication @=@ 0031
+dnet:result_typologies @=@ publication @=@ 0032
+dnet:result_typologies @=@ publication @=@ 0034
+dnet:result_typologies @=@ publication @=@ 0035
+dnet:result_typologies @=@ publication @=@ 0036
+dnet:result_typologies @=@ publication @=@ 0038
+dnet:result_typologies @=@ publication @=@ 0044
+dnet:result_typologies @=@ publication @=@ 0045
+dnet:result_typologies @=@ software @=@ 0029
+dnet:result_typologies @=@ software @=@ 0040
+dnet:countries @=@ AF @=@ AFG
+dnet:countries @=@ AF @=@ Afghanistan
+dnet:countries @=@ AD @=@ Andorra
+dnet:countries @=@ AO @=@ Angola
+dnet:countries @=@ AR @=@ ARG
+dnet:countries @=@ AR @=@ Argentina
+dnet:countries @=@ AU @=@ AUS
+dnet:countries @=@ AU @=@ Australia
+dnet:countries @=@ AT @=@ AUT
+dnet:countries @=@ AT @=@ Austria
+dnet:countries @=@ AZ @=@ AZE
+dnet:countries @=@ BD @=@ Bangladesh
+dnet:countries @=@ BY @=@ Belarus
+dnet:countries @=@ BE @=@ BEL
+dnet:countries @=@ BE @=@ Belgium
+dnet:countries @=@ BJ @=@ BEN
+dnet:countries @=@ BO @=@ Bolivia, Plurinational State of
+dnet:countries @=@ BA @=@ BIH
+dnet:countries @=@ BA @=@ Bosnia-Hercegovina
+dnet:countries @=@ BR @=@ BRA
+dnet:countries @=@ BR @=@ Brazil
+dnet:countries @=@ BG @=@ Bulgaria
+dnet:countries @=@ BF @=@ BFA
+dnet:countries @=@ KH @=@ Cambodia
+dnet:countries @=@ KH @=@ Cambogia
+dnet:countries @=@ KH @=@ Campuchea
+dnet:countries @=@ CM @=@ CMR
+dnet:countries @=@ CA @=@ CAN
+dnet:countries @=@ CA @=@ Canada
+dnet:countries @=@ CV @=@ Cape Verde
+dnet:countries @=@ CL @=@ CHL
+dnet:countries @=@ CL @=@ Chile
+dnet:countries @=@ CN @=@ CHN
+dnet:countries @=@ CN @=@ China
+dnet:countries @=@ CO @=@ COL
+dnet:countries @=@ CO @=@ Colombia
+dnet:countries @=@ CD @=@ Congo
+dnet:countries @=@ CD @=@ Congo Democratic Republic (formerly Zaire)
+dnet:countries @=@ CD @=@ Congo, Republic
+dnet:countries @=@ CD @=@ Congo, the Democratic Republic of the
+dnet:countries @=@ CD @=@ Zaire
+dnet:countries @=@ CR @=@ CRI
+dnet:countries @=@ CI @=@ CIV
+dnet:countries @=@ CI @=@ Ivory Coast
+dnet:countries @=@ HR @=@ Croatia
+dnet:countries @=@ HR @=@ HRV
+dnet:countries @=@ CY @=@ CYP
+dnet:countries @=@ CY @=@ Cyprus
+dnet:countries @=@ CZ @=@ CZE
+dnet:countries @=@ CZ @=@ Czech Republic
+dnet:countries @=@ CZ @=@ Czechia
+dnet:countries @=@ CZ @=@ Czechoslovakia
+dnet:countries @=@ DK @=@ DNK
+dnet:countries @=@ DK @=@ Denmark
+dnet:countries @=@ EC @=@ Ecuador
+dnet:countries @=@ EG @=@ EGY
+dnet:countries @=@ EG @=@ Egypt
+dnet:countries @=@ SV @=@ SLV
+dnet:countries @=@ EE @=@ EST
+dnet:countries @=@ EE @=@ Estonia
+dnet:countries @=@ ET @=@ ETH
+dnet:countries @=@ EU @=@ EEC
+dnet:countries @=@ FJ @=@ FJI
+dnet:countries @=@ FI @=@ FIN
+dnet:countries @=@ FI @=@ Finland
+dnet:countries @=@ MK @=@ Macedonia
+dnet:countries @=@ MK @=@ Macedonia, the Former Yugoslav Republic Of
+dnet:countries @=@ MK @=@ North Macedonia
+dnet:countries @=@ FR @=@ FRA
+dnet:countries @=@ FR @=@ France
+dnet:countries @=@ PF @=@ French Polynesia
+dnet:countries @=@ PF @=@ PYF
+dnet:countries @=@ TF @=@ French Southern Territories
+dnet:countries @=@ GE @=@ Georgia
+dnet:countries @=@ DE @=@ DEU
+dnet:countries @=@ DE @=@ Germany
+dnet:countries @=@ DE @=@ Germany, Berlin
+dnet:countries @=@ GH @=@ GHA
+dnet:countries @=@ GR @=@ EL
+dnet:countries @=@ GR @=@ GRC
+dnet:countries @=@ GL @=@ GRL
+dnet:countries @=@ GN @=@ Guinea
+dnet:countries @=@ GW @=@ Guinea-Bissau
+dnet:countries @=@ VA @=@ Vatican State
+dnet:countries @=@ HK @=@ HKG
+dnet:countries @=@ HK @=@ Hong Kong
+dnet:countries @=@ HK @=@ Hongkong
+dnet:countries @=@ HU @=@ HUN
+dnet:countries @=@ HU @=@ Hungary
+dnet:countries @=@ IS @=@ ISL
+dnet:countries @=@ IN @=@ IND
+dnet:countries @=@ IN @=@ India
+dnet:countries @=@ ID @=@ IDN
+dnet:countries @=@ ID @=@ Indonesia
+dnet:countries @=@ IR @=@ Iran
+dnet:countries @=@ IR @=@ Iran, Islamic Republic of
+dnet:countries @=@ IE @=@ IRL
+dnet:countries @=@ IE @=@ Ireland
+dnet:countries @=@ IL @=@ ISR
+dnet:countries @=@ IL @=@ Israel
+dnet:countries @=@ IT @=@ ITA
+dnet:countries @=@ IT @=@ Italy
+dnet:countries @=@ JM @=@ Jamaica
+dnet:countries @=@ JP @=@ JPN
+dnet:countries @=@ JP @=@ Japan
+dnet:countries @=@ KZ @=@ KAZ
+dnet:countries @=@ KZ @=@ Kazakistan
+dnet:countries @=@ KZ @=@ Kazakstan
+dnet:countries @=@ KE @=@ KEN
+dnet:countries @=@ KE @=@ Kenya
+dnet:countries @=@ KR @=@ KOR
+dnet:countries @=@ KR @=@ Korea, Republic of
+dnet:countries @=@ KR @=@ Korean Republic (South Korea)
+dnet:countries @=@ KP @=@ PRK
+dnet:countries @=@ LV @=@ LVA
+dnet:countries @=@ LY @=@ Libya
+dnet:countries @=@ LT @=@ LTU
+dnet:countries @=@ LU @=@ LUX
+dnet:countries @=@ LU @=@ Luxembourg
+dnet:countries @=@ MO @=@ Macao
+dnet:countries @=@ MG @=@ Madagascar
+dnet:countries @=@ MY @=@ Malaysia
+dnet:countries @=@ ML @=@ Mali
+dnet:countries @=@ MT @=@ Malta
+dnet:countries @=@ MU @=@ Mauritius
+dnet:countries @=@ MX @=@ MEX
+dnet:countries @=@ MX @=@ Mexico
+dnet:countries @=@ FM @=@ Micronesia
+dnet:countries @=@ MD @=@ Moldova
+dnet:countries @=@ MD @=@ Moldova, Republic of
+dnet:countries @=@ MN @=@ Mongolia
+dnet:countries @=@ MA @=@ Morocco
+dnet:countries @=@ MZ @=@ Mozambique
+dnet:countries @=@ NA @=@ NAM
+dnet:countries @=@ NL @=@ NLD
+dnet:countries @=@ NL @=@ Netherlands
+dnet:countries @=@ AN @=@ Netherlands Antilles
+dnet:countries @=@ NC @=@ NCL
+dnet:countries @=@ NZ @=@ NZL
+dnet:countries @=@ NZ @=@ New Zealand
+dnet:countries @=@ NO @=@ NOR
+dnet:countries @=@ NO @=@ Norway
+dnet:countries @=@ OC @=@ Australasia
+dnet:countries @=@ OM @=@ Oman
+dnet:countries @=@ PK @=@ PAK
+dnet:countries @=@ PK @=@ Pakistan
+dnet:countries @=@ PS @=@ Palestin, State of
+dnet:countries @=@ PS @=@ Palestine, State of
+dnet:countries @=@ PS @=@ Palestinian Territory, Occupied
+dnet:countries @=@ PA @=@ PAN
+dnet:countries @=@ PA @=@ Panama
+dnet:countries @=@ PG @=@ PapuaNew Guinea
+dnet:countries @=@ PE @=@ PER
+dnet:countries @=@ PH @=@ PHL
+dnet:countries @=@ PH @=@ Philippines
+dnet:countries @=@ PL @=@ POL
+dnet:countries @=@ PL @=@ Poland
+dnet:countries @=@ PT @=@ PRT
+dnet:countries @=@ PT @=@ Portugal
+dnet:countries @=@ PR @=@ Puerto Rico
+dnet:countries @=@ RO @=@ ROU
+dnet:countries @=@ RO @=@ Romania
+dnet:countries @=@ RU @=@ RUS
+dnet:countries @=@ RU @=@ Russia
+dnet:countries @=@ RU @=@ Russian Federation
+dnet:countries @=@ RE @=@ Réunion
+dnet:countries @=@ KN @=@ Saint Kitts And Nevis
+dnet:countries @=@ SA @=@ Saudi Arabia
+dnet:countries @=@ SN @=@ SEN
+dnet:countries @=@ RS @=@ SRB
+dnet:countries @=@ CS @=@ Serbia and Montenegro
+dnet:countries @=@ SG @=@ SGP
+dnet:countries @=@ SG @=@ Singapore
+dnet:countries @=@ SK @=@ SVK
+dnet:countries @=@ SI @=@ SVN
+dnet:countries @=@ SI @=@ Slovenia
+dnet:countries @=@ ZA @=@ South Africa
+dnet:countries @=@ ZA @=@ ZAF
+dnet:countries @=@ ES @=@ ESP
+dnet:countries @=@ ES @=@ Spain
+dnet:countries @=@ LK @=@ LKA
+dnet:countries @=@ LK @=@ Sri Lanka
+dnet:countries @=@ SD @=@ SDN
+dnet:countries @=@ SR @=@ Suriname
+dnet:countries @=@ SE @=@ SWE
+dnet:countries @=@ SE @=@ Sweden
+dnet:countries @=@ CH @=@ CHE
+dnet:countries @=@ CH @=@ Switzerland
+dnet:countries @=@ SY @=@ Syria
+dnet:countries @=@ ST @=@ Sao Tome and Principe
+dnet:countries @=@ TW @=@ TWN
+dnet:countries @=@ TW @=@ Taiwan
+dnet:countries @=@ TW @=@ Taiwan, Province of China
+dnet:countries @=@ TZ @=@ Tanzania
+dnet:countries @=@ TZ @=@ Tanzania, United Republic of
+dnet:countries @=@ TH @=@ THA
+dnet:countries @=@ TH @=@ Thailand
+dnet:countries @=@ TL @=@ East Timor
+dnet:countries @=@ TN @=@ TUN
+dnet:countries @=@ TN @=@ Tunisia
+dnet:countries @=@ TR @=@ TUR
+dnet:countries @=@ TR @=@ Turkey
+dnet:countries @=@ UNKNOWN @=@ AAA
+dnet:countries @=@ UNKNOWN @=@ [Unknown]
+dnet:countries @=@ UNKNOWN @=@ _?
+dnet:countries @=@ UA @=@ UKR
+dnet:countries @=@ UA @=@ Ukraine
+dnet:countries @=@ AE @=@ United Arab Emirates
+dnet:countries @=@ GB @=@ England
+dnet:countries @=@ GB @=@ GBR
+dnet:countries @=@ GB @=@ Great Britain
+dnet:countries @=@ GB @=@ Great Britain and Northern Ireland
+dnet:countries @=@ GB @=@ Scotland
+dnet:countries @=@ GB @=@ UK
+dnet:countries @=@ GB @=@ United Kingdom
+dnet:countries @=@ US @=@ USA
+dnet:countries @=@ US @=@ United States
+dnet:countries @=@ US @=@ United States of America
+dnet:countries @=@ UY @=@ Uruguay
+dnet:countries @=@ UZ @=@ Uzbekistan
+dnet:countries @=@ VE @=@ Venezuela, Bolivarian Republic of
+dnet:countries @=@ VN @=@ Vietnam
+dnet:countries @=@ VG @=@ British Virgin Islands
+dnet:countries @=@ YU @=@ Jugoslavia
+dnet:countries @=@ YU @=@ Yugoslavia
+dnet:countries @=@ ZW @=@ ABW
+dnet:protocols @=@ oai @=@ OAI-PMH
+dnet:protocols @=@ oai @=@ OAI_PMH
+dnet:pid_types @=@ orcid @=@ ORCID12
+dnet:pid_types @=@ handle @=@ hdl
+dnet:review_levels @=@ 0000 @=@ UNKNOWN
+dnet:review_levels @=@ 0002 @=@ 80 大阪経大学会「Working Paper」
+dnet:review_levels @=@ 0002 @=@ AO
+dnet:review_levels @=@ 0002 @=@ ARTICLE SANS COMITE DE LECTURE (ASCL)
+dnet:review_levels @=@ 0002 @=@ Arbeitspapier
+dnet:review_levels @=@ 0002 @=@ Arbeitspapier [workingPaper]
+dnet:review_levels @=@ 0002 @=@ Article (author)
+dnet:review_levels @=@ 0002 @=@ Article type: preprint
+dnet:review_levels @=@ 0002 @=@ Article(author version)
+dnet:review_levels @=@ 0002 @=@ Article, not peer-reviewed
+dnet:review_levels @=@ 0002 @=@ Articulo no evaluado
+dnet:review_levels @=@ 0002 @=@ Artigo Solicitado e Não Avaliado por Pares
+dnet:review_levels @=@ 0002 @=@ Artigo não avaliado pelos pares
+dnet:review_levels @=@ 0002 @=@ Artigo não avaliado por pares
+dnet:review_levels @=@ 0002 @=@ Artigo não avaliado por pres
+dnet:review_levels @=@ 0002 @=@ Artikkeli|Artikkeli ammattilehdessä. Ei vertaisarvioitu
+dnet:review_levels @=@ 0002 @=@ Artículo no evaluado
+dnet:review_levels @=@ 0002 @=@ Book (non peer-reviewed)
+dnet:review_levels @=@ 0002 @=@ Book Part (author)
+dnet:review_levels @=@ 0002 @=@ Book item; Non-peer-reviewed
+dnet:review_levels @=@ 0002 @=@ Conference preprint
+dnet:review_levels @=@ 0002 @=@ Contribution to book (non peer-reviewed)
+dnet:review_levels @=@ 0002 @=@ Discussion Paper
+dnet:review_levels @=@ 0002 @=@ Document de travail (Working Paper)
+dnet:review_levels @=@ 0002 @=@ Documento de trabajo
+dnet:review_levels @=@ 0002 @=@ Documento de trabajo de investigaci??n
+dnet:review_levels @=@ 0002 @=@ Draft
+dnet:review_levels @=@ 0002 @=@ E-pub ahead of print
+dnet:review_levels @=@ 0002 @=@ Editorial de revista, no evaluado por pares
+dnet:review_levels @=@ 0002 @=@ Editorial de revista, não avaliado por pares
+dnet:review_levels @=@ 0002 @=@ Editorial não avaliado pelos pares
+dnet:review_levels @=@ 0002 @=@ Editors (non peer-reviewed)
+dnet:review_levels @=@ 0002 @=@ Epub ahead of print
+dnet:review_levels @=@ 0002 @=@ Hakemlik Sürecinden Geçmiş Makale
+dnet:review_levels @=@ 0002 @=@ Hakemlik sürecindeki makale
+dnet:review_levels @=@ 0002 @=@ Hakemlik sürecinden geçmemiş kitap değerlendirmesi
+dnet:review_levels @=@ 0002 @=@ Journal Article (author version)
+dnet:review_levels @=@ 0002 @=@ Journal Article Preprint
+dnet:review_levels @=@ 0002 @=@ Journal Editorial, not peer-reviewed
+dnet:review_levels @=@ 0002 @=@ Journal article; Non-peer-reviewed
+dnet:review_levels @=@ 0002 @=@ Journal:WorkingPaper
+dnet:review_levels @=@ 0002 @=@ Manuscript (preprint)
+dnet:review_levels @=@ 0002 @=@ Monográfico (Informes, Documentos de trabajo, etc.)
+dnet:review_levels @=@ 0002 @=@ NOTE INTERNE OU DE TRAVAIL
+dnet:review_levels @=@ 0002 @=@ Nicht begutachteter Beitrag
+dnet:review_levels @=@ 0002 @=@ No evaluado por pares
+dnet:review_levels @=@ 0002 @=@ Non-Refereed
+dnet:review_levels @=@ 0002 @=@ Non-refeered article
+dnet:review_levels @=@ 0002 @=@ Non-refereed Article
+dnet:review_levels @=@ 0002 @=@ Non-refereed Book Review
+dnet:review_levels @=@ 0002 @=@ Non-refereed Review
+dnet:review_levels @=@ 0002 @=@ Non-refereed Text
+dnet:review_levels @=@ 0002 @=@ NonPeerReviewed
+dnet:review_levels @=@ 0002 @=@ Not Peer reviewed
+dnet:review_levels @=@ 0002 @=@ Not Reviewed
+dnet:review_levels @=@ 0002 @=@ Not peer-reviewed
+dnet:review_levels @=@ 0002 @=@ Não Avaliado por Pares
+dnet:review_levels @=@ 0002 @=@ Não avaliada pelos pares
+dnet:review_levels @=@ 0002 @=@ Não avaliado pelos pares
+dnet:review_levels @=@ 0002 @=@ Original article (non peer-reviewed)
+dnet:review_levels @=@ 0002 @=@ Other publication (non peer-review)
+dnet:review_levels @=@ 0002 @=@ Pre Print
+dnet:review_levels @=@ 0002 @=@ Pre-print
+dnet:review_levels @=@ 0002 @=@ Preprint Article
+dnet:review_levels @=@ 0002 @=@ Preprints
+dnet:review_levels @=@ 0002 @=@ Preprints, Working Papers, ...
+dnet:review_levels @=@ 0002 @=@ Rapporto tecnico / Working Paper / Rapporto di progetto
+dnet:review_levels @=@ 0002 @=@ Resumo Não Avaliado por Pares
+dnet:review_levels @=@ 0002 @=@ Review article (non peer-reviewed)
+dnet:review_levels @=@ 0002 @=@ SMUR
+dnet:review_levels @=@ 0002 @=@ Submissão dos artigos
+dnet:review_levels @=@ 0002 @=@ Submitted version
+dnet:review_levels @=@ 0002 @=@ Vertaisarvioimaton kirjan tai muun kokoomateoksen osa
+dnet:review_levels @=@ 0002 @=@ Vorabdruck
+dnet:review_levels @=@ 0002 @=@ Wetensch. publ. non-refereed
+dnet:review_levels @=@ 0002 @=@ Working / discussion paper
+dnet:review_levels @=@ 0002 @=@ Working Document
+dnet:review_levels @=@ 0002 @=@ Working Notes
+dnet:review_levels @=@ 0002 @=@ Working Paper
+dnet:review_levels @=@ 0002 @=@ Working Paper / Technical Report
+dnet:review_levels @=@ 0002 @=@ Working Papers
+dnet:review_levels @=@ 0002 @=@ WorkingPaper
+dnet:review_levels @=@ 0002 @=@ article in non peer-reviewed journal
+dnet:review_levels @=@ 0002 @=@ articolo preliminare
+dnet:review_levels @=@ 0002 @=@ articulo preliminar
+dnet:review_levels @=@ 0002 @=@ articulo sin revision por pares
+dnet:review_levels @=@ 0002 @=@ artigo preliminar
+dnet:review_levels @=@ 0002 @=@ artigo sem revisão
+dnet:review_levels @=@ 0002 @=@ artículo preliminar
+dnet:review_levels @=@ 0002 @=@ artículo sin revisión por pares
+dnet:review_levels @=@ 0002 @=@ bookchapter (author version)
+dnet:review_levels @=@ 0002 @=@ borrador
+dnet:review_levels @=@ 0002 @=@ column (author version)
+dnet:review_levels @=@ 0002 @=@ communication_invitee
+dnet:review_levels @=@ 0002 @=@ doc-type:preprint
+dnet:review_levels @=@ 0002 @=@ doc-type:workingPaper
+dnet:review_levels @=@ 0002 @=@ draf
+dnet:review_levels @=@ 0002 @=@ eu-repo/semantics/submittedVersion
+dnet:review_levels @=@ 0002 @=@ http://purl.org/coar/resource_type/c_8042
+dnet:review_levels @=@ 0002 @=@ http://purl.org/coar/resource_type/c_816b
+dnet:review_levels @=@ 0002 @=@ http://purl.org/coar/version/c_71e4c1898caa6e32
+dnet:review_levels @=@ 0002 @=@ http://purl.org/coar/version/c_b1a7d7d4d402bcce
+dnet:review_levels @=@ 0002 @=@ http://purl.org/eprint/type/SubmittedBookItem
+dnet:review_levels @=@ 0002 @=@ http://purl.org/eprint/type/SubmittedJournalArticle
+dnet:review_levels @=@ 0002 @=@ http://purl.org/info:eu-repo/semantics/authorVersion
+dnet:review_levels @=@ 0002 @=@ http://purl.org/info:eu-repo/semantics/submittedVersion
+dnet:review_levels @=@ 0002 @=@ http://purl.org/spar/fabio/Preprint
+dnet:review_levels @=@ 0002 @=@ http://purl.org/spar/fabio/WorkingPaper
+dnet:review_levels @=@ 0002 @=@ https://dictionary.casrai.org/Preprint
+dnet:review_levels @=@ 0002 @=@ info:ar-repo/semantics/documento de trabajo
+dnet:review_levels @=@ 0002 @=@ info:ar-repo/semantics/documentoDeTrabajo
+dnet:review_levels @=@ 0002 @=@ info:eu repo/semantics/draft
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/authorVersion
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/draft
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/preprint
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/submitedVersion
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/submittedVersion
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/unReviewed
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/updatedVersion
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/semantics/workingPaper
+dnet:review_levels @=@ 0002 @=@ info:eu-repo/submittedVersion
+dnet:review_levels @=@ 0002 @=@ info:ulb-repo/semantics/articleNonPeerReview
+dnet:review_levels @=@ 0002 @=@ info:ulb-repo/semantics/openurl/vlink-workingpaper
+dnet:review_levels @=@ 0002 @=@ info:ulb-repo/semantics/workingPaper
+dnet:review_levels @=@ 0002 @=@ non peer-reviewed article
+dnet:review_levels @=@ 0002 @=@ non-refereed review article
+dnet:review_levels @=@ 0002 @=@ não avaliado
+dnet:review_levels @=@ 0002 @=@ preprint
+dnet:review_levels @=@ 0002 @=@ prepublicación
+dnet:review_levels @=@ 0002 @=@ proceeding, seminar, workshop without peer review
+dnet:review_levels @=@ 0002 @=@ proceedings (author version)
+dnet:review_levels @=@ 0002 @=@ pré-print
+dnet:review_levels @=@ 0002 @=@ pré-publication
+dnet:review_levels @=@ 0002 @=@ préprint
+dnet:review_levels @=@ 0002 @=@ prépublication
+dnet:review_levels @=@ 0002 @=@ publicació preliminar
+dnet:review_levels @=@ 0002 @=@ publication-preprint
+dnet:review_levels @=@ 0002 @=@ publication-workingpaper
+dnet:review_levels @=@ 0002 @=@ submitedVersion
+dnet:review_levels @=@ 0002 @=@ submittedVersion
+dnet:review_levels @=@ 0002 @=@ voordruk
+dnet:review_levels @=@ 0002 @=@ workingPaper
+dnet:review_levels @=@ 0002 @=@ ön baskı
+dnet:review_levels @=@ 0002 @=@ Препринт
+dnet:review_levels @=@ 0002 @=@ предпечатная версия публикации
+dnet:review_levels @=@ 0002 @=@ препринт статьи
+dnet:review_levels @=@ 0002 @=@ ディスカッション／ワーキング・ペーパー DP/WP
+dnet:review_levels @=@ 0002 @=@ プレプリント
+dnet:review_levels @=@ 0002 @=@ プレプリント Preprint
+dnet:review_levels @=@ 0002 @=@ プレプリント（Preprint）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-その他（査読無し）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-テクニカルレポート類（査読無し）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-会議発表論文（査読無し）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-図書（査読無し）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-学術雑誌論文（査読無し）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-紀要論文（査読無し）
+dnet:review_levels @=@ 0002 @=@ 印刷物/電子媒体-雑誌記事（査読無し）
+dnet:review_levels @=@ 0002 @=@ 预印本
+dnet:review_levels @=@ 0001 @=@ ##rt.metadata.pkp.peerReviewed##
+dnet:review_levels @=@ 0001 @=@ A1 Alkuperäisartikkeli tieteellisessä aikakauslehdessä
+dnet:review_levels @=@ 0001 @=@ Art?culo revisado por pares
+dnet:review_levels @=@ 0001 @=@ Article revisat per persones expertes
+dnet:review_levels @=@ 0001 @=@ Article type: peer review
+dnet:review_levels @=@ 0001 @=@ Article évalué par les pairs
+dnet:review_levels @=@ 0001 @=@ Article évalué par des pairs
+dnet:review_levels @=@ 0001 @=@ Article évalué par les pairs
+dnet:review_levels @=@ 0001 @=@ Articolo valutato secondo i criteri della peer review
+dnet:review_levels @=@ 0001 @=@ Articulo evaluado por dos pares
+dnet:review_levels @=@ 0001 @=@ Articulo revisado por pares
+dnet:review_levels @=@ 0001 @=@ Artigo Avaliado pelos Pares
+dnet:review_levels @=@ 0001 @=@ Artigo Revisto por Pares
+dnet:review_levels @=@ 0001 @=@ Artigo avaliado por blind peer review
+dnet:review_levels @=@ 0001 @=@ Artigo avaliado por pares
+dnet:review_levels @=@ 0001 @=@ Artigo de convidado. Avaliado pelos pares
+dnet:review_levels @=@ 0001 @=@ Artigos; Avaliado pelos pares
+dnet:review_levels @=@ 0001 @=@ Artículo de investigación, Investigaciones originales, Artículo evaluado por pares, Investigaciones empíricas
+dnet:review_levels @=@ 0001 @=@ Artículo evaluado por pares
+dnet:review_levels @=@ 0001 @=@ Artículo evaluado por pares, Ensayos de investigación
+dnet:review_levels @=@ 0001 @=@ Artículo evaluado por pares, Investigaciones empíricas, Artículos de investigación
+dnet:review_levels @=@ 0001 @=@ Artículo revisado
+dnet:review_levels @=@ 0001 @=@ Artículo revisado por pares
+dnet:review_levels @=@ 0001 @=@ Artículos de estudiantes, Artículo evaluado por pares, Artículos de investigación
+dnet:review_levels @=@ 0001 @=@ Artículos de investigación evaluados por doble ciego
+dnet:review_levels @=@ 0001 @=@ Artículos evaluadores por doble ciego
+dnet:review_levels @=@ 0001 @=@ Artículos evaluados por pares
+dnet:review_levels @=@ 0001 @=@ Artículos evaluados por pares académicos
+dnet:review_levels @=@ 0001 @=@ Artículos revisados por pares
+dnet:review_levels @=@ 0001 @=@ Avaliadas pelos pares
+dnet:review_levels @=@ 0001 @=@ Avaliado anonimamente por pares
+dnet:review_levels @=@ 0001 @=@ Avaliado em duplo cego por pares
+dnet:review_levels @=@ 0001 @=@ Avaliado pela Editoria
+dnet:review_levels @=@ 0001 @=@ Avaliado pela Editoria. Avaliado pelos pares.
+dnet:review_levels @=@ 0001 @=@ Avaliado pelo Editoria
+dnet:review_levels @=@ 0001 @=@ Avaliado pelo pares
+dnet:review_levels @=@ 0001 @=@ Avaliado pelos Editores
+dnet:review_levels @=@ 0001 @=@ Avaliado pelos pares
+dnet:review_levels @=@ 0001 @=@ Avaliado pelos pares, Artigo de convidado
+dnet:review_levels @=@ 0001 @=@ Avaliado pelos pares, Artigos Originais
+dnet:review_levels @=@ 0001 @=@ Avaliado pelos pares, Artigos Originais, Artigos de Revisão
+dnet:review_levels @=@ 0001 @=@ Avaliado pelos pares. Avaliado pelo Editoria
+dnet:review_levels @=@ 0001 @=@ Avaliado po Pares
+dnet:review_levels @=@ 0001 @=@ Avaliado por Editor
+dnet:review_levels @=@ 0001 @=@ Avaliado por pares
+dnet:review_levels @=@ 0001 @=@ Avaliados pelos pares
+dnet:review_levels @=@ 0001 @=@ Avaliados por Pares
+dnet:review_levels @=@ 0001 @=@ Blind Peer-reviewed Article
+dnet:review_levels @=@ 0001 @=@ Book (peer-reviewed)
+dnet:review_levels @=@ 0001 @=@ Comentario de libros, Comentario de revistas, Comentario de conferencias, Artículo evaluado por pares, Artículo de investigación
+dnet:review_levels @=@ 0001 @=@ Conference paper; Peer-reviewed
+dnet:review_levels @=@ 0001 @=@ Contribution to book (peer-reviewed)
+dnet:review_levels @=@ 0001 @=@ Documento Avaliado por Pares
+dnet:review_levels @=@ 0001 @=@ Double blind evaluation articles
+dnet:review_levels @=@ 0001 @=@ Double blind peer review
+dnet:review_levels @=@ 0001 @=@ Editors (peer-reviewed)
+dnet:review_levels @=@ 0001 @=@ Evaluación por pares
+dnet:review_levels @=@ 0001 @=@ Evaluado por pares
+dnet:review_levels @=@ 0001 @=@ Evaluados por los pares
+dnet:review_levels @=@ 0001 @=@ Hakem sürecinden geçmiş makale
+dnet:review_levels @=@ 0001 @=@ Hakemli makale
+dnet:review_levels @=@ 0001 @=@ Hakemlik Sürecinden Geçmiş
+dnet:review_levels @=@ 0001 @=@ Invited Peer-Reviewed Article
+dnet:review_levels @=@ 0001 @=@ Journal article; Peer-reviewed
+dnet:review_levels @=@ 0001 @=@ Original article (peer-reviewed)
+dnet:review_levels @=@ 0001 @=@ Other publication (peer-review)
+dnet:review_levels @=@ 0001 @=@ Paper peer-reviewed
+dnet:review_levels @=@ 0001 @=@ Papers evaluated by academic peers
+dnet:review_levels @=@ 0001 @=@ Peer reviewed
+dnet:review_levels @=@ 0001 @=@ Peer reviewed article
+dnet:review_levels @=@ 0001 @=@ Peer reviewed invited commentry
+dnet:review_levels @=@ 0001 @=@ Peer-Reviewed Protocol
+dnet:review_levels @=@ 0001 @=@ Peer-reviewd Article
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed Article
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed Paper
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed Review
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed Review Article
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed Text
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed communication
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed conference proceedings
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed research article
+dnet:review_levels @=@ 0001 @=@ Peer-reviewed short communication
+dnet:review_levels @=@ 0001 @=@ PeerReviewed
+dnet:review_levels @=@ 0001 @=@ Proceedings (peer-reviewed)
+dnet:review_levels @=@ 0001 @=@ Refereed
+dnet:review_levels @=@ 0001 @=@ Refereed Article
+dnet:review_levels @=@ 0001 @=@ Research articles evaluated by double blind
+dnet:review_levels @=@ 0001 @=@ Resenha avaliada pelos pares
+dnet:review_levels @=@ 0001 @=@ Review article (peer-reviewed)
+dnet:review_levels @=@ 0001 @=@ Reviewed by peers
+dnet:review_levels @=@ 0001 @=@ Revisión por Expertos
+dnet:review_levels @=@ 0001 @=@ Revisto por Pares
+dnet:review_levels @=@ 0001 @=@ SBBq abstracts / peer-reviewed
+dnet:review_levels @=@ 0001 @=@ SBBq resúmenes - revisada por pares
+dnet:review_levels @=@ 0001 @=@ Scholarly publ. Refereed
+dnet:review_levels @=@ 0001 @=@ Scientific Publ (refereed)
+dnet:review_levels @=@ 0001 @=@ Vertaisarvioimaton kirjoitus tieteellisessä aikakauslehdessä
+dnet:review_levels @=@ 0001 @=@ Vertaisarvioitu alkuperäisartikkeli tieteellisessä aikakauslehdessä
+dnet:review_levels @=@ 0001 @=@ Vertaisarvioitu artikkeli konferenssijulkaisussa
+dnet:review_levels @=@ 0001 @=@ Vertaisarvioitu artikkeli tieteellisessä aikakauslehdessä
+dnet:review_levels @=@ 0001 @=@ Vertaisarvioitu kirjan tai muun kokoomateoksen osa
+dnet:review_levels @=@ 0001 @=@ Wetensch. publ. Refereed
+dnet:review_levels @=@ 0001 @=@ article in peer-reviewed journal
+dnet:review_levels @=@ 0001 @=@ articles validés
+dnet:review_levels @=@ 0001 @=@ avaliado por pares, temas livres
+dnet:review_levels @=@ 0001 @=@ info:eu-repo/semantics/peerReviewed
+dnet:review_levels @=@ 0001 @=@ info:ulb-repo/semantics/articlePeerReview
+dnet:review_levels @=@ 0001 @=@ proceeding with peer review
+dnet:review_levels @=@ 0001 @=@ refereed_publications
+dnet:review_levels @=@ 0001 @=@ ul_published_reviewed
+dnet:review_levels @=@ 0001 @=@ Άρθρο που έχει αξιολογηθεί από ομότιμους ειδικούς
+dnet:review_levels @=@ 0001 @=@ Άρθρο το οποίο έχει περάσει από ομότιμη αξιολόγηση
+dnet:review_levels @=@ 0001 @=@ レフェリー付き論文
+dnet:review_levels @=@ 0001 @=@ 印刷物/電子媒体-テクニカルレポート類（査読有り）
+dnet:review_levels @=@ 0001 @=@ 印刷物/電子媒体-会議発表論文（査読有り）
+dnet:review_levels @=@ 0001 @=@ 印刷物/電子媒体-図書（査読有り）
+dnet:review_levels @=@ 0001 @=@ 印刷物/電子媒体-学術雑誌論文（査読有り）
+dnet:review_levels @=@ 0001 @=@ 印刷物/電子媒体-紀要論文（査読有り）
+dnet:review_levels @=@ 0001 @=@ 印刷物/電子媒体-雑誌記事（査読有り）
+dnet:review_levels @=@ 0001 @=@ 原著論文（査読有り）
+dnet:review_levels @=@ 0001 @=@ 査読論文
\ No newline at end of file
diff --git a/dhp-common/src/test/resources/eu/dnetlib/dhp/transform/terms.txt b/dhp-common/src/test/resources/eu/dnetlib/dhp/transform/terms.txt
new file mode 100644
index 000000000..93cc00eca
--- /dev/null
+++ b/dhp-common/src/test/resources/eu/dnetlib/dhp/transform/terms.txt
@@ -0,0 +1,1080 @@
+ModularUiLabels @=@ ModularUiLabels @=@ PendingRepositoryResources @=@ Pending datasource
+ModularUiLabels @=@ ModularUiLabels @=@ RepositoryServiceResources @=@ Valid datasource
+dnet:content_description_typologies @=@ D-Net Content Description Typologies @=@ file::EuropePMC @=@ file::EuropePMC
+dnet:content_description_typologies @=@ D-Net Content Description Typologies @=@ file::PDF @=@ file::PDF
+dnet:content_description_typologies @=@ D-Net Content Description Typologies @=@ file::WoS @=@ file::WoS
+dnet:content_description_typologies @=@ D-Net Content Description Typologies @=@ metadata @=@ metadata
+dnet:content_description_typologies @=@ D-Net Content Description Typologies @=@ file::hybrid @=@ file::hybrid
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk:cris @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:actionset:orcidworks-no-doi @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk:infospace @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk:aggregator @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk:datasetarchive @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:actionset @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk:entityregistry @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:crosswalk:repository @=@ Harvested
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:mining:aggregator @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ community:subject @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ community:zenodocommunity @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ iis @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:mining:entityregistry @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ community:organization @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:mining:infospace @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:dedup @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ community:datasource @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ propagation:project:semrel @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:mining:cris @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:mining:repository @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ sysimport:mining:datasetarchive @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ community:semrel @=@ Inferred by OpenAIRE
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ user:claim @=@ Linked by user
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ user:claim:pid @=@ Linked by user
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ user:insert @=@ Linked by user
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ user:claim:search @=@ Linked by user
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ UNKNOWN @=@ UNKNOWN
+dnet:provenanceActions @=@ dnet:provenanceActions @=@ country:instrepos @=@ Inferred by OpenAIRE
+dnet:access_modes @=@ dnet:access_modes @=@ 12MONTHS @=@ 12 Months Embargo
+dnet:access_modes @=@ dnet:access_modes @=@ 6MONTHS @=@ 6 Months Embargo
+dnet:access_modes @=@ dnet:access_modes @=@ CLOSED @=@ Closed Access
+dnet:access_modes @=@ dnet:access_modes @=@ EMBARGO @=@ Embargo
+dnet:access_modes @=@ dnet:access_modes @=@ OPEN @=@ Open Access
+dnet:access_modes @=@ dnet:access_modes @=@ OPEN SOURCE @=@ Open Source
+dnet:access_modes @=@ dnet:access_modes @=@ OTHER @=@ Other
+dnet:access_modes @=@ dnet:access_modes @=@ RESTRICTED @=@ Restricted
+dnet:access_modes @=@ dnet:access_modes @=@ UNKNOWN @=@ not available
+fct:funding_typologies @=@ fct:funding_typologies @=@ fct:program @=@ fct:program
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ openaire2.0 @=@ OpenAIRE 2.0 (EC funding)
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ openaire3.0 @=@ OpenAIRE 3.0 (OA, funding)
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ driver @=@ OpenAIRE Basic (DRIVER OA)
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ openaire-cris_1.1 @=@ OpenAIRE CRIS v1.1
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ openaire2.0_data @=@ OpenAIRE Data (funded, referenced datasets)
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ openaire-pub_4.0 @=@ OpenAIRE PubRepos v4.0
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ hostedBy @=@ collected from a compatible aggregator
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ files @=@ files
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ native @=@ native
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ UNKNOWN @=@ not available
+dnet:compatibilityLevel @=@ dnet:compatibilityLevel @=@ notCompatible @=@ under validation
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ UNKNOWN @=@ UNKNOWN
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ available @=@ available
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ copyrighted @=@ copyrighted
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ created @=@ created
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ endDate @=@ endDate
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ issued @=@ issued
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ startDate @=@ startDate
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ submitted @=@ submitted
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ updated @=@ updated
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ valid @=@ valid
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ published-print @=@ published-print
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ published-online @=@ published-online
+dnet:dataCite_date @=@ dnet:dataCite_date @=@ accepted @=@ accepted
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ crissystem @=@ CRIS System
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ datarepository::unknown @=@ Data Repository
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ aggregator::datarepository @=@ Data Repository Aggregator
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ entityregistry::projects @=@ Funder database
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ infospace @=@ Information Space
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ pubsrepository::institutional @=@ Institutional Repository
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ aggregator::pubsrepository::institutional @=@ Institutional Repository Aggregator
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ pubsrepository::journal @=@ Journal
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ aggregator::pubsrepository::journals @=@ Journal Aggregator/Publisher
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ pubsrepository::mock @=@ Other
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ pubscatalogue::unknown @=@ Publication Catalogue
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ pubsrepository::unknown @=@ Publication Repository
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ aggregator::pubsrepository::unknown @=@ Publication Repository Aggregator
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ entityregistry @=@ Registry
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ entityregistry::repositories @=@ Registry of repositories
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ entityregistry::products @=@ Registry of research products
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ entityregistry::researchers @=@ Registry of researchers
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ entityregistry::organizations @=@ Registry of organizations
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ scholarcomminfra @=@ Scholarly Comm. Infrastructure
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ softwarerepository @=@ Software Repository
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ pubsrepository::thematic @=@ Thematic Repository
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ websource @=@ Web Source
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ aggregator::softwarerepository @=@ Software Repository Aggregator
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ orprepository @=@ Repository
+dnet:datasource_typologies @=@ dnet:datasource_typologies @=@ researchgraph @=@ Research Graph
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ ACM @=@ ACM Computing Classification System
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ agrovoc @=@ AGROVOC
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ bicssc @=@ BIC standard subject categories
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ DFG @=@ DFG Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ ddc @=@ Dewey Decimal Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ nsf:fieldOfApplication @=@ Field of Application (NSF)
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ gok @=@ Göttingen Online Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ ec:h2020topics @=@ Horizon 2020 Topics
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ IPC @=@ International Patent Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ jel @=@ JEL Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ lcsh @=@ Library of Congress Subject Headings
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ msc @=@ Mathematics Subject Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ mesheuropmc @=@ Medical Subject Headings
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ mesh @=@ Medical Subject Headings
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ bk @=@ Nederlandse basisclassificatie
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ dnet:od_subjects @=@ OpenDOAR subjects
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ ocis @=@ Optics Classification and Indexing Scheme
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ pacs @=@ Physics and Astronomy Classification Scheme
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ rvk @=@ Regensburger Verbundklassifikation
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ UNKNOWN @=@ UNKNOWN
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ udc @=@ Universal Decimal Classification
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ wos @=@ Web of Science Subject Areas
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ arxiv @=@ arXiv
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ keyword @=@ keyword
+dnet:subject_classification_typologies @=@ dnet:subject_classification_typologies @=@ MAG @=@ Microsoft Academic Graph classification
+fct:contractTypes @=@ fct:contractTypes @=@ UNKNOWN @=@ UNKNOWN
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0018 @=@ Annotation
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0001 @=@ Article
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0033 @=@ Audiovisual
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0008 @=@ Bachelor thesis
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0046 @=@ Bioentity
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0002 @=@ Book
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0037 @=@ Clinical Trial
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0022 @=@ Collection
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0004 @=@ Conference object
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0005 @=@ Contribution for newspaper or weekly magazine
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0045 @=@ Data Management Plan
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0031 @=@ Data Paper
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0021 @=@ Dataset
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0006 @=@ Doctoral thesis
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0023 @=@ Event
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0009 @=@ External research report
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0024 @=@ Film
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0025 @=@ Image
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0026 @=@ InteractiveResource
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0011 @=@ Internal report
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0043 @=@ Journal
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0010 @=@ Lecture
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0007 @=@ Master thesis
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0027 @=@ Model
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0012 @=@ Newsletter
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0020 @=@ Other ORP type
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0039 @=@ Other dataset type
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0038 @=@ Other literature type
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0040 @=@ Other software type
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0013 @=@ Part of book or chapter of book
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0019 @=@ Patent
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0028 @=@ PhysicalObject
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0016 @=@ Preprint
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0034 @=@ Project deliverable
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0035 @=@ Project milestone
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0036 @=@ Project proposal
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0017 @=@ Report
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0014 @=@ Research
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0015 @=@ Review
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0029 @=@ Software
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0032 @=@ Software Paper
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0030 @=@ Sound
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0044 @=@ Thesis
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0000 @=@ Unknown
+dnet:publication_resource @=@ dnet:publication_resource @=@ 0042 @=@ Virtual Appliance
+ec:funding_typologies @=@ ec:funding_typologies @=@ ec:frameworkprogram @=@ frameworkprogram
+ec:funding_typologies @=@ ec:funding_typologies @=@ ec:program @=@ program
+ec:funding_typologies @=@ ec:funding_typologies @=@ ec:specificprogram @=@ specificprogram
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ 171 @=@ Article 171 of the Treaty
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ BSG @=@ Research for the benefit of specific groups
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ CIP-EIP-TN @=@ CIP-Eco-Innovation - CIP-Thematic Network
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ CP @=@ Collaborative project
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ CP-CSA @=@ Combination of CP & CSA
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ CSA @=@ Coordination and support action
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ ERC @=@ Support for frontier research (ERC)
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ MC @=@ Support for training and career development of researchers (Marie Curie)
+ec:FP7contractTypes @=@ ec:FP7contractTypes @=@ NoE @=@ Network of Excellence
+wt:funding_relations @=@ wt:funding_relations @=@ wt:hasParentFunding @=@ wt:hasParentFunding
+dnet:languages @=@ dnet:languages @=@ abk @=@ Abkhazian
+dnet:languages @=@ dnet:languages @=@ ace @=@ Achinese
+dnet:languages @=@ dnet:languages @=@ ach @=@ Acoli
+dnet:languages @=@ dnet:languages @=@ ada @=@ Adangme
+dnet:languages @=@ dnet:languages @=@ aar @=@ Afar
+dnet:languages @=@ dnet:languages @=@ afh @=@ Afrihili
+dnet:languages @=@ dnet:languages @=@ afr @=@ Afrikaans
+dnet:languages @=@ dnet:languages @=@ afa @=@ Afro-Asiatic
+dnet:languages @=@ dnet:languages @=@ aka @=@ Akan
+dnet:languages @=@ dnet:languages @=@ akk @=@ Akkadian
+dnet:languages @=@ dnet:languages @=@ alb/sqi @=@ Albanian
+dnet:languages @=@ dnet:languages @=@ ale @=@ Aleut
+dnet:languages @=@ dnet:languages @=@ alg @=@ Algonquian languages
+dnet:languages @=@ dnet:languages @=@ tut @=@ Altaic
+dnet:languages @=@ dnet:languages @=@ amh @=@ Amharic
+dnet:languages @=@ dnet:languages @=@ egy @=@ Ancient Egyptian
+dnet:languages @=@ dnet:languages @=@ grc @=@ Ancient Greek
+dnet:languages @=@ dnet:languages @=@ apa @=@ Apache
+dnet:languages @=@ dnet:languages @=@ ara @=@ Arabic
+dnet:languages @=@ dnet:languages @=@ arg @=@ Aragonese
+dnet:languages @=@ dnet:languages @=@ arc @=@ Aramaic
+dnet:languages @=@ dnet:languages @=@ arp @=@ Arapaho
+dnet:languages @=@ dnet:languages @=@ arn @=@ Araucanian
+dnet:languages @=@ dnet:languages @=@ arw @=@ Arawak
+dnet:languages @=@ dnet:languages @=@ arm/hye @=@ Armenian
+dnet:languages @=@ dnet:languages @=@ art @=@ Artificial
+dnet:languages @=@ dnet:languages @=@ asm @=@ Assamese
+dnet:languages @=@ dnet:languages @=@ ath @=@ Athapascan
+dnet:languages @=@ dnet:languages @=@ map @=@ Austronesian
+dnet:languages @=@ dnet:languages @=@ ina @=@ Auxiliary Language Association)
+dnet:languages @=@ dnet:languages @=@ ava @=@ Avaric
+dnet:languages @=@ dnet:languages @=@ ave @=@ Avestan
+dnet:languages @=@ dnet:languages @=@ awa @=@ Awadhi
+dnet:languages @=@ dnet:languages @=@ aym @=@ Aymara
+dnet:languages @=@ dnet:languages @=@ aze @=@ Azerbaijani
+dnet:languages @=@ dnet:languages @=@ nah @=@ Aztec
+dnet:languages @=@ dnet:languages @=@ ban @=@ Balinese
+dnet:languages @=@ dnet:languages @=@ bat @=@ Baltic
+dnet:languages @=@ dnet:languages @=@ bal @=@ Baluchi
+dnet:languages @=@ dnet:languages @=@ bam @=@ Bambara
+dnet:languages @=@ dnet:languages @=@ bai @=@ Bamileke
+dnet:languages @=@ dnet:languages @=@ bad @=@ Banda
+dnet:languages @=@ dnet:languages @=@ bnt @=@ Bantu
+dnet:languages @=@ dnet:languages @=@ bas @=@ Basa
+dnet:languages @=@ dnet:languages @=@ bak @=@ Bashkir
+dnet:languages @=@ dnet:languages @=@ baq/eus @=@ Basque
+dnet:languages @=@ dnet:languages @=@ bej @=@ Beja
+dnet:languages @=@ dnet:languages @=@ bel @=@ Belarusian
+dnet:languages @=@ dnet:languages @=@ bem @=@ Bemba
+dnet:languages @=@ dnet:languages @=@ ben @=@ Bengali
+dnet:languages @=@ dnet:languages @=@ ber @=@ Berber
+dnet:languages @=@ dnet:languages @=@ bho @=@ Bhojpuri
+dnet:languages @=@ dnet:languages @=@ bih @=@ Bihari
+dnet:languages @=@ dnet:languages @=@ bik @=@ Bikol
+dnet:languages @=@ dnet:languages @=@ bin @=@ Bini
+dnet:languages @=@ dnet:languages @=@ bis @=@ Bislama
+dnet:languages @=@ dnet:languages @=@ nob @=@ Bokmål, Norwegian; Norwegian Bokmål
+dnet:languages @=@ dnet:languages @=@ bos @=@ Bosnian
+dnet:languages @=@ dnet:languages @=@ bra @=@ Braj
+dnet:languages @=@ dnet:languages @=@ bre @=@ Breton
+dnet:languages @=@ dnet:languages @=@ bug @=@ Buginese
+dnet:languages @=@ dnet:languages @=@ bul @=@ Bulgarian
+dnet:languages @=@ dnet:languages @=@ bua @=@ Buriat
+dnet:languages @=@ dnet:languages @=@ bur/mya @=@ Burmese
+dnet:languages @=@ dnet:languages @=@ cad @=@ Caddo
+dnet:languages @=@ dnet:languages @=@ car @=@ Carib
+dnet:languages @=@ dnet:languages @=@ cat @=@ Catalan; Valencian
+dnet:languages @=@ dnet:languages @=@ cau @=@ Caucasian
+dnet:languages @=@ dnet:languages @=@ ceb @=@ Cebuano
+dnet:languages @=@ dnet:languages @=@ cel @=@ Celtic
+dnet:languages @=@ dnet:languages @=@ cai @=@ Central American Indian
+dnet:languages @=@ dnet:languages @=@ chg @=@ Chagatai
+dnet:languages @=@ dnet:languages @=@ cha @=@ Chamorro
+dnet:languages @=@ dnet:languages @=@ che @=@ Chechen
+dnet:languages @=@ dnet:languages @=@ chr @=@ Cherokee
+dnet:languages @=@ dnet:languages @=@ nya @=@ Chewa; Chichewa; Nyanja
+dnet:languages @=@ dnet:languages @=@ chy @=@ Cheyenne
+dnet:languages @=@ dnet:languages @=@ chb @=@ Chibcha
+dnet:languages @=@ dnet:languages @=@ chi/zho @=@ Chinese
+dnet:languages @=@ dnet:languages @=@ chn @=@ Chinook jargon
+dnet:languages @=@ dnet:languages @=@ cho @=@ Choctaw
+dnet:languages @=@ dnet:languages @=@ chu @=@ Church Slavic; Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic
+dnet:languages @=@ dnet:languages @=@ chv @=@ Chuvash
+dnet:languages @=@ dnet:languages @=@ cop @=@ Coptic
+dnet:languages @=@ dnet:languages @=@ cor @=@ Cornish
+dnet:languages @=@ dnet:languages @=@ cos @=@ Corsican
+dnet:languages @=@ dnet:languages @=@ cre @=@ Cree
+dnet:languages @=@ dnet:languages @=@ mus @=@ Creek
+dnet:languages @=@ dnet:languages @=@ crp @=@ Creoles and Pidgins
+dnet:languages @=@ dnet:languages @=@ hrv @=@ Croatian
+dnet:languages @=@ dnet:languages @=@ cus @=@ Cushitic
+dnet:languages @=@ dnet:languages @=@ ces/cze @=@ Czech
+dnet:languages @=@ dnet:languages @=@ dak @=@ Dakota
+dnet:languages @=@ dnet:languages @=@ dan @=@ Danish
+dnet:languages @=@ dnet:languages @=@ del @=@ Delaware
+dnet:languages @=@ dnet:languages @=@ din @=@ Dinka
+dnet:languages @=@ dnet:languages @=@ div @=@ Divehi
+dnet:languages @=@ dnet:languages @=@ doi @=@ Dogri
+dnet:languages @=@ dnet:languages @=@ dra @=@ Dravidian
+dnet:languages @=@ dnet:languages @=@ dua @=@ Duala
+dnet:languages @=@ dnet:languages @=@ dut/nld @=@ Dutch; Flemish
+dnet:languages @=@ dnet:languages @=@ dyu @=@ Dyula
+dnet:languages @=@ dnet:languages @=@ dzo @=@ Dzongkha
+dnet:languages @=@ dnet:languages @=@ efi @=@ Efik
+dnet:languages @=@ dnet:languages @=@ eka @=@ Ekajuk
+dnet:languages @=@ dnet:languages @=@ elx @=@ Elamite
+dnet:languages @=@ dnet:languages @=@ eng @=@ English
+dnet:languages @=@ dnet:languages @=@ cpe @=@ English-based Creoles and Pidgins
+dnet:languages @=@ dnet:languages @=@ esk @=@ Eskimo
+dnet:languages @=@ dnet:languages @=@ epo @=@ Esperanto
+dnet:languages @=@ dnet:languages @=@ est @=@ Estonian
+dnet:languages @=@ dnet:languages @=@ ewe @=@ Ewe
+dnet:languages @=@ dnet:languages @=@ ewo @=@ Ewondo
+dnet:languages @=@ dnet:languages @=@ fan @=@ Fang
+dnet:languages @=@ dnet:languages @=@ fat @=@ Fanti
+dnet:languages @=@ dnet:languages @=@ fao @=@ Faroese
+dnet:languages @=@ dnet:languages @=@ fij @=@ Fijian
+dnet:languages @=@ dnet:languages @=@ fin @=@ Finnish
+dnet:languages @=@ dnet:languages @=@ fiu @=@ Finno-Ugrian
+dnet:languages @=@ dnet:languages @=@ fon @=@ Fon
+dnet:languages @=@ dnet:languages @=@ fra/fre @=@ French
+dnet:languages @=@ dnet:languages @=@ cpf @=@ French-based Creoles and Pidgins
+dnet:languages @=@ dnet:languages @=@ fry @=@ Frisian
+dnet:languages @=@ dnet:languages @=@ ful @=@ Fulah
+dnet:languages @=@ dnet:languages @=@ gaa @=@ Ga
+dnet:languages @=@ dnet:languages @=@ gae/gdh @=@ Gaelic
+dnet:languages @=@ dnet:languages @=@ gla @=@ Gaelic; Scottish Gaelic
+dnet:languages @=@ dnet:languages @=@ glg @=@ Galician
+dnet:languages @=@ dnet:languages @=@ lug @=@ Ganda
+dnet:languages @=@ dnet:languages @=@ gay @=@ Gayo
+dnet:languages @=@ dnet:languages @=@ gez @=@ Geez
+dnet:languages @=@ dnet:languages @=@ geo/kat @=@ Georgian
+dnet:languages @=@ dnet:languages @=@ deu/ger @=@ German
+dnet:languages @=@ dnet:languages @=@ gem @=@ Germanic
+dnet:languages @=@ dnet:languages @=@ kik @=@ Gikuyu; Kikuyu
+dnet:languages @=@ dnet:languages @=@ gil @=@ Gilbertese
+dnet:languages @=@ dnet:languages @=@ gon @=@ Gondi
+dnet:languages @=@ dnet:languages @=@ got @=@ Gothic
+dnet:languages @=@ dnet:languages @=@ grb @=@ Grebo
+dnet:languages @=@ dnet:languages @=@ ell/gre @=@ Greek
+dnet:languages @=@ dnet:languages @=@ gre/ell @=@ Greek, Modern (1453-)
+dnet:languages @=@ dnet:languages @=@ kal @=@ Greenlandic; Kalaallisut
+dnet:languages @=@ dnet:languages @=@ grn @=@ Guarani
+dnet:languages @=@ dnet:languages @=@ guj @=@ Gujarati
+dnet:languages @=@ dnet:languages @=@ hai @=@ Haida
+dnet:languages @=@ dnet:languages @=@ hat @=@ Haitian; Haitian Creole
+dnet:languages @=@ dnet:languages @=@ hau @=@ Hausa
+dnet:languages @=@ dnet:languages @=@ haw @=@ Hawaiian
+dnet:languages @=@ dnet:languages @=@ heb @=@ Hebrew
+dnet:languages @=@ dnet:languages @=@ her @=@ Herero
+dnet:languages @=@ dnet:languages @=@ hil @=@ Hiligaynon
+dnet:languages @=@ dnet:languages @=@ him @=@ Himachali
+dnet:languages @=@ dnet:languages @=@ hin @=@ Hindi
+dnet:languages @=@ dnet:languages @=@ hmo @=@ Hiri Motu
+dnet:languages @=@ dnet:languages @=@ hun @=@ Hungarian
+dnet:languages @=@ dnet:languages @=@ hup @=@ Hupa
+dnet:languages @=@ dnet:languages @=@ iba @=@ Iban
+dnet:languages @=@ dnet:languages @=@ ice/isl @=@ Icelandic
+dnet:languages @=@ dnet:languages @=@ ido @=@ Ido
+dnet:languages @=@ dnet:languages @=@ ibo @=@ Igbo
+dnet:languages @=@ dnet:languages @=@ ijo @=@ Ijo
+dnet:languages @=@ dnet:languages @=@ ilo @=@ Iloko
+dnet:languages @=@ dnet:languages @=@ inc @=@ Indic
+dnet:languages @=@ dnet:languages @=@ ine @=@ Indo-European
+dnet:languages @=@ dnet:languages @=@ ind @=@ Indonesian
+dnet:languages @=@ dnet:languages @=@ ile @=@ Interlingue
+dnet:languages @=@ dnet:languages @=@ iku @=@ Inuktitut
+dnet:languages @=@ dnet:languages @=@ ipk @=@ Inupiaq
+dnet:languages @=@ dnet:languages @=@ ira @=@ Iranian
+dnet:languages @=@ dnet:languages @=@ gai/iri @=@ Irish
+dnet:languages @=@ dnet:languages @=@ iro @=@ Iroquoian
+dnet:languages @=@ dnet:languages @=@ ita @=@ Italian
+dnet:languages @=@ dnet:languages @=@ jpn @=@ Japanese
+dnet:languages @=@ dnet:languages @=@ jav @=@ Javanese
+dnet:languages @=@ dnet:languages @=@ jrb @=@ Judeo-Arabic
+dnet:languages @=@ dnet:languages @=@ jpr @=@ Judeo-Persian
+dnet:languages @=@ dnet:languages @=@ kab @=@ Kabyle
+dnet:languages @=@ dnet:languages @=@ kac @=@ Kachin
+dnet:languages @=@ dnet:languages @=@ kam @=@ Kamba
+dnet:languages @=@ dnet:languages @=@ kan @=@ Kannada
+dnet:languages @=@ dnet:languages @=@ kau @=@ Kanuri
+dnet:languages @=@ dnet:languages @=@ kaa @=@ Kara-Kalpak
+dnet:languages @=@ dnet:languages @=@ kar @=@ Karen
+dnet:languages @=@ dnet:languages @=@ kas @=@ Kashmiri
+dnet:languages @=@ dnet:languages @=@ kaw @=@ Kawi
+dnet:languages @=@ dnet:languages @=@ kaz @=@ Kazakh
+dnet:languages @=@ dnet:languages @=@ kha @=@ Khasi
+dnet:languages @=@ dnet:languages @=@ khm @=@ Khmer
+dnet:languages @=@ dnet:languages @=@ khi @=@ Khoisan
+dnet:languages @=@ dnet:languages @=@ kho @=@ Khotanese
+dnet:languages @=@ dnet:languages @=@ kin @=@ Kinyarwanda
+dnet:languages @=@ dnet:languages @=@ kir @=@ Kirghiz
+dnet:languages @=@ dnet:languages @=@ kom @=@ Komi
+dnet:languages @=@ dnet:languages @=@ kon @=@ Kongo
+dnet:languages @=@ dnet:languages @=@ kok @=@ Konkani
+dnet:languages @=@ dnet:languages @=@ kor @=@ Korean
+dnet:languages @=@ dnet:languages @=@ kpe @=@ Kpelle
+dnet:languages @=@ dnet:languages @=@ kro @=@ Kru
+dnet:languages @=@ dnet:languages @=@ kua @=@ Kuanyama; Kwanyama
+dnet:languages @=@ dnet:languages @=@ kum @=@ Kumyk
+dnet:languages @=@ dnet:languages @=@ kur @=@ Kurdish
+dnet:languages @=@ dnet:languages @=@ kru @=@ Kurukh
+dnet:languages @=@ dnet:languages @=@ kus @=@ Kusaie
+dnet:languages @=@ dnet:languages @=@ kut @=@ Kutenai
+dnet:languages @=@ dnet:languages @=@ lad @=@ Ladino
+dnet:languages @=@ dnet:languages @=@ lah @=@ Lahnda
+dnet:languages @=@ dnet:languages @=@ lam @=@ Lamba
+dnet:languages @=@ dnet:languages @=@ lao @=@ Lao
+dnet:languages @=@ dnet:languages @=@ lat @=@ Latin
+dnet:languages @=@ dnet:languages @=@ lav @=@ Latvian
+dnet:languages @=@ dnet:languages @=@ ltz @=@ Letzeburgesch; Luxembourgish
+dnet:languages @=@ dnet:languages @=@ lez @=@ Lezghian
+dnet:languages @=@ dnet:languages @=@ lim @=@ Limburgan; Limburger; Limburgish
+dnet:languages @=@ dnet:languages @=@ lin @=@ Lingala
+dnet:languages @=@ dnet:languages @=@ lit @=@ Lithuanian
+dnet:languages @=@ dnet:languages @=@ loz @=@ Lozi
+dnet:languages @=@ dnet:languages @=@ lub @=@ Luba-Katanga
+dnet:languages @=@ dnet:languages @=@ lui @=@ Luiseno
+dnet:languages @=@ dnet:languages @=@ lun @=@ Lunda
+dnet:languages @=@ dnet:languages @=@ luo @=@ Luo
+dnet:languages @=@ dnet:languages @=@ mac/mak @=@ Macedonian
+dnet:languages @=@ dnet:languages @=@ mad @=@ Madurese
+dnet:languages @=@ dnet:languages @=@ mag @=@ Magahi
+dnet:languages @=@ dnet:languages @=@ mai @=@ Maithili
+dnet:languages @=@ dnet:languages @=@ mak @=@ Makasar
+dnet:languages @=@ dnet:languages @=@ mlg @=@ Malagasy
+dnet:languages @=@ dnet:languages @=@ may/msa @=@ Malay
+dnet:languages @=@ dnet:languages @=@ mal @=@ Malayalam
+dnet:languages @=@ dnet:languages @=@ mlt @=@ Maltese
+dnet:languages @=@ dnet:languages @=@ man @=@ Mandingo
+dnet:languages @=@ dnet:languages @=@ mni @=@ Manipuri
+dnet:languages @=@ dnet:languages @=@ mno @=@ Manobo
+dnet:languages @=@ dnet:languages @=@ glv @=@ Manx
+dnet:languages @=@ dnet:languages @=@ mao/mri @=@ Maori
+dnet:languages @=@ dnet:languages @=@ mar @=@ Marathi
+dnet:languages @=@ dnet:languages @=@ chm @=@ Mari
+dnet:languages @=@ dnet:languages @=@ mah @=@ Marshallese
+dnet:languages @=@ dnet:languages @=@ mwr @=@ Marwari
+dnet:languages @=@ dnet:languages @=@ mas @=@ Masai
+dnet:languages @=@ dnet:languages @=@ myn @=@ Mayan
+dnet:languages @=@ dnet:languages @=@ men @=@ Mende
+dnet:languages @=@ dnet:languages @=@ mic @=@ Micmac
+dnet:languages @=@ dnet:languages @=@ dum @=@ Middle Dutch
+dnet:languages @=@ dnet:languages @=@ enm @=@ Middle English
+dnet:languages @=@ dnet:languages @=@ frm @=@ Middle French
+dnet:languages @=@ dnet:languages @=@ gmh @=@ Middle High German
+dnet:languages @=@ dnet:languages @=@ mga @=@ Middle Irish
+dnet:languages @=@ dnet:languages @=@ min @=@ Minangkabau
+dnet:languages @=@ dnet:languages @=@ mis @=@ Miscellaneous
+dnet:languages @=@ dnet:languages @=@ moh @=@ Mohawk
+dnet:languages @=@ dnet:languages @=@ mol @=@ Moldavian
+dnet:languages @=@ dnet:languages @=@ mkh @=@ Mon-Kmer
+dnet:languages @=@ dnet:languages @=@ lol @=@ Mongo
+dnet:languages @=@ dnet:languages @=@ mon @=@ Mongolian
+dnet:languages @=@ dnet:languages @=@ mos @=@ Mossi
+dnet:languages @=@ dnet:languages @=@ mul @=@ Multiple languages
+dnet:languages @=@ dnet:languages @=@ mun @=@ Munda
+dnet:languages @=@ dnet:languages @=@ nau @=@ Nauru
+dnet:languages @=@ dnet:languages @=@ nav @=@ Navajo; Navaho
+dnet:languages @=@ dnet:languages @=@ nde @=@ Ndebele, North
+dnet:languages @=@ dnet:languages @=@ nbl @=@ Ndebele, South
+dnet:languages @=@ dnet:languages @=@ ndo @=@ Ndonga
+dnet:languages @=@ dnet:languages @=@ nep @=@ Nepali
+dnet:languages @=@ dnet:languages @=@ new @=@ Newari
+dnet:languages @=@ dnet:languages @=@ nic @=@ Niger-Kordofanian
+dnet:languages @=@ dnet:languages @=@ ssa @=@ Nilo-Saharan
+dnet:languages @=@ dnet:languages @=@ niu @=@ Niuean
+dnet:languages @=@ dnet:languages @=@ non @=@ Norse
+dnet:languages @=@ dnet:languages @=@ nai @=@ North American Indian
+dnet:languages @=@ dnet:languages @=@ sme @=@ Northern Sami
+dnet:languages @=@ dnet:languages @=@ nor @=@ Norwegian
+dnet:languages @=@ dnet:languages @=@ nno @=@ Norwegian Nynorsk; Nynorsk, Norwegian
+dnet:languages @=@ dnet:languages @=@ nub @=@ Nubian
+dnet:languages @=@ dnet:languages @=@ nym @=@ Nyamwezi
+dnet:languages @=@ dnet:languages @=@ nyn @=@ Nyankole
+dnet:languages @=@ dnet:languages @=@ nyo @=@ Nyoro
+dnet:languages @=@ dnet:languages @=@ nzi @=@ Nzima
+dnet:languages @=@ dnet:languages @=@ oci @=@ Occitan (post 1500); Provençal
+dnet:languages @=@ dnet:languages @=@ oji @=@ Ojibwa
+dnet:languages @=@ dnet:languages @=@ ang @=@ Old English
+dnet:languages @=@ dnet:languages @=@ fro @=@ Old French
+dnet:languages @=@ dnet:languages @=@ goh @=@ Old High German
+dnet:languages @=@ dnet:languages @=@ ori @=@ Oriya
+dnet:languages @=@ dnet:languages @=@ orm @=@ Oromo
+dnet:languages @=@ dnet:languages @=@ osa @=@ Osage
+dnet:languages @=@ dnet:languages @=@ oss @=@ Ossetian; Ossetic
+dnet:languages @=@ dnet:languages @=@ oto @=@ Otomian
+dnet:languages @=@ dnet:languages @=@ ota @=@ Ottoman
+dnet:languages @=@ dnet:languages @=@ pal @=@ Pahlavi
+dnet:languages @=@ dnet:languages @=@ pau @=@ Palauan
+dnet:languages @=@ dnet:languages @=@ pli @=@ Pali
+dnet:languages @=@ dnet:languages @=@ pam @=@ Pampanga
+dnet:languages @=@ dnet:languages @=@ pag @=@ Pangasinan
+dnet:languages @=@ dnet:languages @=@ pan @=@ Panjabi; Punjabi
+dnet:languages @=@ dnet:languages @=@ pap @=@ Papiamento
+dnet:languages @=@ dnet:languages @=@ paa @=@ Papuan-Australian
+dnet:languages @=@ dnet:languages @=@ fas/per @=@ Persian
+dnet:languages @=@ dnet:languages @=@ peo @=@ Persian, Old (ca 600 - 400 B.C.)
+dnet:languages @=@ dnet:languages @=@ phn @=@ Phoenician
+dnet:languages @=@ dnet:languages @=@ pol @=@ Polish
+dnet:languages @=@ dnet:languages @=@ pon @=@ Ponape
+dnet:languages @=@ dnet:languages @=@ por @=@ Portuguese
+dnet:languages @=@ dnet:languages @=@ cpp @=@ Portuguese-based Creoles and Pidgins
+dnet:languages @=@ dnet:languages @=@ pra @=@ Prakrit
+dnet:languages @=@ dnet:languages @=@ pro @=@ Provencal
+dnet:languages @=@ dnet:languages @=@ pus @=@ Pushto
+dnet:languages @=@ dnet:languages @=@ que @=@ Quechua
+dnet:languages @=@ dnet:languages @=@ roh @=@ Raeto-Romance
+dnet:languages @=@ dnet:languages @=@ raj @=@ Rajasthani
+dnet:languages @=@ dnet:languages @=@ rar @=@ Rarotongan
+dnet:languages @=@ dnet:languages @=@ roa @=@ Romance
+dnet:languages @=@ dnet:languages @=@ ron/rum @=@ Romanian
+dnet:languages @=@ dnet:languages @=@ rom @=@ Romany
+dnet:languages @=@ dnet:languages @=@ run @=@ Rundi
+dnet:languages @=@ dnet:languages @=@ rus @=@ Russian
+dnet:languages @=@ dnet:languages @=@ sal @=@ Salishan
+dnet:languages @=@ dnet:languages @=@ sam @=@ Samaritan
+dnet:languages @=@ dnet:languages @=@ smi @=@ Sami
+dnet:languages @=@ dnet:languages @=@ smo @=@ Samoan
+dnet:languages @=@ dnet:languages @=@ sad @=@ Sandawe
+dnet:languages @=@ dnet:languages @=@ sag @=@ Sango
+dnet:languages @=@ dnet:languages @=@ san @=@ Sanskrit
+dnet:languages @=@ dnet:languages @=@ srd @=@ Sardinian
+dnet:languages @=@ dnet:languages @=@ sco @=@ Scots
+dnet:languages @=@ dnet:languages @=@ sel @=@ Selkup
+dnet:languages @=@ dnet:languages @=@ sem @=@ Semitic
+dnet:languages @=@ dnet:languages @=@ srp @=@ Serbian
+dnet:languages @=@ dnet:languages @=@ scr @=@ Serbo-Croatian
+dnet:languages @=@ dnet:languages @=@ srr @=@ Serer
+dnet:languages @=@ dnet:languages @=@ shn @=@ Shan
+dnet:languages @=@ dnet:languages @=@ sna @=@ Shona
+dnet:languages @=@ dnet:languages @=@ iii @=@ Sichuan Yi
+dnet:languages @=@ dnet:languages @=@ sid @=@ Sidamo
+dnet:languages @=@ dnet:languages @=@ bla @=@ Siksika
+dnet:languages @=@ dnet:languages @=@ snd @=@ Sindhi
+dnet:languages @=@ dnet:languages @=@ sin @=@ Sinhala; Sinhalese
+dnet:languages @=@ dnet:languages @=@ sit @=@ Sino-Tibetan
+dnet:languages @=@ dnet:languages @=@ sio @=@ Siouan
+dnet:languages @=@ dnet:languages @=@ sla @=@ Slavic
+dnet:languages @=@ dnet:languages @=@ slk/slo @=@ Slovak
+dnet:languages @=@ dnet:languages @=@ slv @=@ Slovenian
+dnet:languages @=@ dnet:languages @=@ sog @=@ Sogdian
+dnet:languages @=@ dnet:languages @=@ som @=@ Somali
+dnet:languages @=@ dnet:languages @=@ son @=@ Songhai
+dnet:languages @=@ dnet:languages @=@ wen @=@ Sorbian
+dnet:languages @=@ dnet:languages @=@ nso @=@ Sotho
+dnet:languages @=@ dnet:languages @=@ sot @=@ Sotho, Southern
+dnet:languages @=@ dnet:languages @=@ sai @=@ South American Indian
+dnet:languages @=@ dnet:languages @=@ esl/spa @=@ Spanish
+dnet:languages @=@ dnet:languages @=@ spa @=@ Spanish; Castilian
+dnet:languages @=@ dnet:languages @=@ suk @=@ Sukuma
+dnet:languages @=@ dnet:languages @=@ sux @=@ Sumerian
+dnet:languages @=@ dnet:languages @=@ sun @=@ Sundanese
+dnet:languages @=@ dnet:languages @=@ sus @=@ Susu
+dnet:languages @=@ dnet:languages @=@ swa @=@ Swahili
+dnet:languages @=@ dnet:languages @=@ ssw @=@ Swati
+dnet:languages @=@ dnet:languages @=@ swe @=@ Swedish
+dnet:languages @=@ dnet:languages @=@ syr @=@ Syriac
+dnet:languages @=@ dnet:languages @=@ tgl @=@ Tagalog
+dnet:languages @=@ dnet:languages @=@ tah @=@ Tahitian
+dnet:languages @=@ dnet:languages @=@ tgk @=@ Tajik
+dnet:languages @=@ dnet:languages @=@ tmh @=@ Tamashek
+dnet:languages @=@ dnet:languages @=@ tam @=@ Tamil
+dnet:languages @=@ dnet:languages @=@ tat @=@ Tatar
+dnet:languages @=@ dnet:languages @=@ tel @=@ Telugu
+dnet:languages @=@ dnet:languages @=@ ter @=@ Tereno
+dnet:languages @=@ dnet:languages @=@ tha @=@ Thai
+dnet:languages @=@ dnet:languages @=@ bod/tib @=@ Tibetan
+dnet:languages @=@ dnet:languages @=@ tig @=@ Tigre
+dnet:languages @=@ dnet:languages @=@ tir @=@ Tigrinya
+dnet:languages @=@ dnet:languages @=@ tem @=@ Timne
+dnet:languages @=@ dnet:languages @=@ tiv @=@ Tivi
+dnet:languages @=@ dnet:languages @=@ tli @=@ Tlingit
+dnet:languages @=@ dnet:languages @=@ ton @=@ Tonga (Tonga Islands)
+dnet:languages @=@ dnet:languages @=@ tog @=@ Tonga(Nyasa)
+dnet:languages @=@ dnet:languages @=@ tru @=@ Truk
+dnet:languages @=@ dnet:languages @=@ tsi @=@ Tsimshian
+dnet:languages @=@ dnet:languages @=@ tso @=@ Tsonga
+dnet:languages @=@ dnet:languages @=@ tsn @=@ Tswana
+dnet:languages @=@ dnet:languages @=@ tum @=@ Tumbuka
+dnet:languages @=@ dnet:languages @=@ tur @=@ Turkish
+dnet:languages @=@ dnet:languages @=@ tuk @=@ Turkmen
+dnet:languages @=@ dnet:languages @=@ tyv @=@ Tuvinian
+dnet:languages @=@ dnet:languages @=@ twi @=@ Twi
+dnet:languages @=@ dnet:languages @=@ uga @=@ Ugaritic
+dnet:languages @=@ dnet:languages @=@ uig @=@ Uighur; Uyghur
+dnet:languages @=@ dnet:languages @=@ ukr @=@ Ukrainian
+dnet:languages @=@ dnet:languages @=@ umb @=@ Umbundu
+dnet:languages @=@ dnet:languages @=@ und @=@ Undetermined
+dnet:languages @=@ dnet:languages @=@ urd @=@ Urdu
+dnet:languages @=@ dnet:languages @=@ uzb @=@ Uzbek
+dnet:languages @=@ dnet:languages @=@ vai @=@ Vai
+dnet:languages @=@ dnet:languages @=@ ven @=@ Venda
+dnet:languages @=@ dnet:languages @=@ vie @=@ Vietnamese
+dnet:languages @=@ dnet:languages @=@ vol @=@ Volapük
+dnet:languages @=@ dnet:languages @=@ vot @=@ Votic
+dnet:languages @=@ dnet:languages @=@ wak @=@ Wakashan
+dnet:languages @=@ dnet:languages @=@ wal @=@ Walamo
+dnet:languages @=@ dnet:languages @=@ wln @=@ Walloon
+dnet:languages @=@ dnet:languages @=@ war @=@ Waray
+dnet:languages @=@ dnet:languages @=@ was @=@ Washo
+dnet:languages @=@ dnet:languages @=@ cym/wel @=@ Welsh
+dnet:languages @=@ dnet:languages @=@ wol @=@ Wolof
+dnet:languages @=@ dnet:languages @=@ xho @=@ Xhosa
+dnet:languages @=@ dnet:languages @=@ sah @=@ Yakut
+dnet:languages @=@ dnet:languages @=@ yao @=@ Yao
+dnet:languages @=@ dnet:languages @=@ yap @=@ Yap
+dnet:languages @=@ dnet:languages @=@ yid @=@ Yiddish
+dnet:languages @=@ dnet:languages @=@ yor @=@ Yoruba
+dnet:languages @=@ dnet:languages @=@ zap @=@ Zapotec
+dnet:languages @=@ dnet:languages @=@ zen @=@ Zenaga
+dnet:languages @=@ dnet:languages @=@ zha @=@ Zhuang; Chuang
+dnet:languages @=@ dnet:languages @=@ zul @=@ Zulu
+dnet:languages @=@ dnet:languages @=@ zun @=@ Zuni
+dnet:languages @=@ dnet:languages @=@ sga @=@ old Irish
+nsf:contractTypes @=@ NSF Contract Types @=@ BOA/Task Order @=@ BOA/Task Order
+nsf:contractTypes @=@ NSF Contract Types @=@ Continuing grant @=@ Continuing grant
+nsf:contractTypes @=@ NSF Contract Types @=@ Contract @=@ Contract
+nsf:contractTypes @=@ NSF Contract Types @=@ Contract Interagency Agreement @=@ Contract Interagency Agreement
+nsf:contractTypes @=@ NSF Contract Types @=@ Cooperative Agreement @=@ Cooperative Agreement
+nsf:contractTypes @=@ NSF Contract Types @=@ Fellowship @=@ Fellowship
+nsf:contractTypes @=@ NSF Contract Types @=@ Fixed Price Award @=@ Fixed Price Award
+nsf:contractTypes @=@ NSF Contract Types @=@ GAA @=@ GAA
+nsf:contractTypes @=@ NSF Contract Types @=@ Interagency Agreement @=@ Interagency Agreement
+nsf:contractTypes @=@ NSF Contract Types @=@ Intergovernmental Personnel Award @=@ Intergovernmental Personnel Award
+nsf:contractTypes @=@ NSF Contract Types @=@ Personnel Agreement @=@ Personnel Agreement
+nsf:contractTypes @=@ NSF Contract Types @=@ Standard Grant @=@ Standard Grant
+ec:funding_relations @=@ ec:funding_relations @=@ ec:hasframeworkprogram @=@ hasframeworkprogram
+ec:funding_relations @=@ ec:funding_relations @=@ ec:hasprogram @=@ hasprogram
+ec:funding_relations @=@ ec:funding_relations @=@ ec:hasspecificprogram @=@ hasspecificprogram
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ UNKNOWN @=@ UNKNOWN
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ collection @=@ collection
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ dataset @=@ dataset
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ event @=@ event
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ film @=@ film
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ image @=@ image
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ interactiveResource @=@ interactiveResource
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ model @=@ model
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ physicalObject @=@ physicalObject
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ service @=@ service
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ software @=@ software
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ sound @=@ sound
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ text @=@ text
+dnet:dataCite_resource @=@ dnet:dataCite_resource @=@ clinicalTrial @=@ Clinical trial
+dnet:dataCite_title @=@ dnet:dataCite_title @=@ alternative title @=@ alternative title
+dnet:dataCite_title @=@ dnet:dataCite_title @=@ main title @=@ main title
+dnet:dataCite_title @=@ dnet:dataCite_title @=@ subtitle @=@ subtitle
+dnet:dataCite_title @=@ dnet:dataCite_title @=@ translated title @=@ translated title
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ IsCitedBy @=@ IsCitedBy
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ IsNewVersionOf @=@ IsNewVersionOf
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ IsPartOf @=@ IsPartOf
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ IsPreviousVersionOf @=@ IsPreviousVersionOf
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ IsReferencedBy @=@ IsReferencedBy
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ References @=@ References
+datacite:relation_typologies @=@ datacite:relation_typologies @=@ UNKNOWN @=@ UNKNOWN
+dnet:result_typologies @=@ dnet:result_typologies @=@ dataset @=@ dataset
+dnet:result_typologies @=@ dnet:result_typologies @=@ other @=@ other
+dnet:result_typologies @=@ dnet:result_typologies @=@ publication @=@ publication
+dnet:result_typologies @=@ dnet:result_typologies @=@ software @=@ software
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-ADG @=@ Advanced Grant
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ BBI-CSA @=@ Bio-based Industries Coordination and Support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ BBI-IA-DEMO @=@ Bio-based Industries Innovation action - Demonstration
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ BBI-IA-FLAG @=@ Bio-based Industries Innovation action - Flagship
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ BBI-RIA @=@ Bio-based Industries Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-IF-EF-CAR @=@ CAR – Career Restart panel
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ COFUND-EJP @=@ COFUND (European Joint Programme)
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ COFUND-PCP @=@ COFUND (PCP)
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ COFUND-PPI @=@ COFUND (PPI)
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ CS2-CSA @=@ CS2 Coordination and Support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ CS2-IA @=@ CS2 Innovation Action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ CS2-RIA @=@ CS2 Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ CSA-LS @=@ CSA Lump sum
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-COG @=@ Consolidator Grant
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ FCH2-CSA @=@ Coordination & support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ CSA @=@ Coordination and support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-COFUND-DP @=@ Doctoral programmes
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ECSEL-CSA @=@ ECSEL Coordination & Support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ECSEL-IA @=@ ECSEL Innovation Action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ECSEL-RIA @=@ ECSEL Research and Innovation Actions
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERA-NET-Cofund @=@ ERA-NET Cofund
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-POC-LS @=@ ERC Proof of Concept Lump Sum Pilot
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-SyG @=@ ERC Synergy Grant
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-LVG @=@ ERC low value grant
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ H2020-EEN-SGA @=@ Enterprise Europe Network - Specific Grant Agreement
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-ITN-EID @=@ European Industrial Doctorates
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-ITN-EJD @=@ European Joint Doctorates
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-ITN-ETN @=@ European Training Networks
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ FCH2-IA @=@ FCH2 Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ FCH2-RIA @=@ FCH2 Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-COFUND-FP @=@ Fellowship programmes
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-IF-GF @=@ Global Fellowships
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ IMI2-CSA @=@ IMI2 Coordination & support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ IMI2-RIA @=@ IMI2 Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ Shift2Rail-IA-LS @=@ Innovation Action Lump-Sum
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ IA-LS @=@ Innovation Action Lump-Sum
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ IA @=@ Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ Shift2Rail-IA @=@ Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ PCP @=@ Pre-Commercial Procurement
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-POC @=@ Proof of Concept Grant
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ PPI @=@ Public Procurement of Innovative Solutions
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-IF-EF-RI @=@ RI – Reintegration panel
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-RISE @=@ RISE
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ Shift2Rail-RIA-LS @=@ Research and Innovation Action Lump-Sum
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ Shift2Rail-RIA @=@ Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ RIA @=@ Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ RIA-LS @=@ Research and Innovation action Lump Sum
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SESAR-CSA @=@ SESAR: Coordination and Support Action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SESAR-IA @=@ SESAR: Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SESAR-RIA @=@ SESAR: Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SGA-RIA @=@ SGA Research and Innovation action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SME-2b @=@ SME Instrument (grant only and blended finance)
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SME-1 @=@ SME instrument phase 1
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SME-2 @=@ SME instrument phase 2
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ Shift2Rail-CSA @=@ Shift2Rail - Coordination and Support action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-IF-EF-SE @=@ Society and Enterprise panel
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ SGA-CSA @=@ Specific Grant agreement and Coordination and Support Action
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-IF-EF-ST @=@ Standard EF
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ ERC-STG @=@ Starting Grant
+ec:h2020toas @=@ Horizon 2020 - Type of Actions @=@ MSCA-SNLS @=@ Grant to identified beneficiary - Coordination and support actions (MSCA-Special Needs lump sum)
+wt:contractTypes @=@ wt:contractTypes @=@ UNKNOWN @=@ UNKNOWN
+dnet:countries @=@ dnet:countries @=@ AF @=@ Afghanistan
+dnet:countries @=@ dnet:countries @=@ AL @=@ Albania
+dnet:countries @=@ dnet:countries @=@ DZ @=@ Algeria
+dnet:countries @=@ dnet:countries @=@ AS @=@ American Samoa
+dnet:countries @=@ dnet:countries @=@ AD @=@ Andorra
+dnet:countries @=@ dnet:countries @=@ AO @=@ Angola
+dnet:countries @=@ dnet:countries @=@ AI @=@ Anguilla
+dnet:countries @=@ dnet:countries @=@ AQ @=@ Antarctica
+dnet:countries @=@ dnet:countries @=@ AG @=@ Antigua and Barbuda
+dnet:countries @=@ dnet:countries @=@ AR @=@ Argentina
+dnet:countries @=@ dnet:countries @=@ AM @=@ Armenia
+dnet:countries @=@ dnet:countries @=@ AW @=@ Aruba
+dnet:countries @=@ dnet:countries @=@ AU @=@ Australia
+dnet:countries @=@ dnet:countries @=@ AT @=@ Austria
+dnet:countries @=@ dnet:countries @=@ AZ @=@ Azerbaijan
+dnet:countries @=@ dnet:countries @=@ BS @=@ Bahamas
+dnet:countries @=@ dnet:countries @=@ BH @=@ Bahrain
+dnet:countries @=@ dnet:countries @=@ BD @=@ Bangladesh
+dnet:countries @=@ dnet:countries @=@ BB @=@ Barbados
+dnet:countries @=@ dnet:countries @=@ BY @=@ Belarus
+dnet:countries @=@ dnet:countries @=@ BE @=@ Belgium
+dnet:countries @=@ dnet:countries @=@ BZ @=@ Belize
+dnet:countries @=@ dnet:countries @=@ BJ @=@ Benin
+dnet:countries @=@ dnet:countries @=@ BM @=@ Bermuda
+dnet:countries @=@ dnet:countries @=@ BT @=@ Bhutan
+dnet:countries @=@ dnet:countries @=@ BO @=@ Bolivia
+dnet:countries @=@ dnet:countries @=@ BQ @=@ Bonaire, Sint Eustatius and Saba
+dnet:countries @=@ dnet:countries @=@ BA @=@ Bosnia and Herzegovina
+dnet:countries @=@ dnet:countries @=@ BW @=@ Botswana
+dnet:countries @=@ dnet:countries @=@ BV @=@ Bouvet Island
+dnet:countries @=@ dnet:countries @=@ BR @=@ Brazil
+dnet:countries @=@ dnet:countries @=@ IO @=@ British Indian Ocean Territory
+dnet:countries @=@ dnet:countries @=@ BN @=@ Brunei Darussalam
+dnet:countries @=@ dnet:countries @=@ BG @=@ Bulgaria
+dnet:countries @=@ dnet:countries @=@ BF @=@ Burkina Faso
+dnet:countries @=@ dnet:countries @=@ BI @=@ Burundi
+dnet:countries @=@ dnet:countries @=@ KH @=@ Cambodia
+dnet:countries @=@ dnet:countries @=@ CM @=@ Cameroon
+dnet:countries @=@ dnet:countries @=@ CA @=@ Canada
+dnet:countries @=@ dnet:countries @=@ CV @=@ Cape Verde
+dnet:countries @=@ dnet:countries @=@ KY @=@ Cayman Islands
+dnet:countries @=@ dnet:countries @=@ CF @=@ Central African Republic
+dnet:countries @=@ dnet:countries @=@ TD @=@ Chad
+dnet:countries @=@ dnet:countries @=@ CL @=@ Chile
+dnet:countries @=@ dnet:countries @=@ CN @=@ China (People's Republic of)
+dnet:countries @=@ dnet:countries @=@ CX @=@ Christmas Island
+dnet:countries @=@ dnet:countries @=@ CC @=@ Cocos (Keeling) Islands
+dnet:countries @=@ dnet:countries @=@ CO @=@ Colombia
+dnet:countries @=@ dnet:countries @=@ KM @=@ Comoros
+dnet:countries @=@ dnet:countries @=@ CG @=@ Congo
+dnet:countries @=@ dnet:countries @=@ CD @=@ Congo (Democratic Republic of)
+dnet:countries @=@ dnet:countries @=@ CK @=@ Cook Islands
+dnet:countries @=@ dnet:countries @=@ CR @=@ Costa Rica
+dnet:countries @=@ dnet:countries @=@ CI @=@ Cote d'Ivoire
+dnet:countries @=@ dnet:countries @=@ HR @=@ Croatia
+dnet:countries @=@ dnet:countries @=@ CU @=@ Cuba
+dnet:countries @=@ dnet:countries @=@ CW @=@ Curaçao
+dnet:countries @=@ dnet:countries @=@ CY @=@ Cyprus
+dnet:countries @=@ dnet:countries @=@ CZ @=@ Czech Republic
+dnet:countries @=@ dnet:countries @=@ DK @=@ Denmark
+dnet:countries @=@ dnet:countries @=@ DJ @=@ Djibouti
+dnet:countries @=@ dnet:countries @=@ DM @=@ Dominica
+dnet:countries @=@ dnet:countries @=@ DO @=@ Dominican Republic
+dnet:countries @=@ dnet:countries @=@ EC @=@ Ecuador
+dnet:countries @=@ dnet:countries @=@ EG @=@ Egypt
+dnet:countries @=@ dnet:countries @=@ SV @=@ El Salvador
+dnet:countries @=@ dnet:countries @=@ GQ @=@ Equatorial Guinea
+dnet:countries @=@ dnet:countries @=@ ER @=@ Eritrea
+dnet:countries @=@ dnet:countries @=@ EE @=@ Estonia
+dnet:countries @=@ dnet:countries @=@ ET @=@ Ethiopia
+dnet:countries @=@ dnet:countries @=@ EU @=@ European Union
+dnet:countries @=@ dnet:countries @=@ FK @=@ Falkland Islands (Malvinas)
+dnet:countries @=@ dnet:countries @=@ FO @=@ Faroe Islands
+dnet:countries @=@ dnet:countries @=@ FJ @=@ Fiji
+dnet:countries @=@ dnet:countries @=@ FI @=@ Finland
+dnet:countries @=@ dnet:countries @=@ MK @=@ Former Yugoslav Republic of Macedonia
+dnet:countries @=@ dnet:countries @=@ FR @=@ France
+dnet:countries @=@ dnet:countries @=@ GF @=@ French Guiana
+dnet:countries @=@ dnet:countries @=@ PF @=@ French Polynesia
+dnet:countries @=@ dnet:countries @=@ TF @=@ French Southern Territories
+dnet:countries @=@ dnet:countries @=@ GA @=@ Gabon
+dnet:countries @=@ dnet:countries @=@ GM @=@ Gambia
+dnet:countries @=@ dnet:countries @=@ GE @=@ Georgia
+dnet:countries @=@ dnet:countries @=@ DE @=@ Germany
+dnet:countries @=@ dnet:countries @=@ GH @=@ Ghana
+dnet:countries @=@ dnet:countries @=@ GI @=@ Gibraltar
+dnet:countries @=@ dnet:countries @=@ GR @=@ Greece
+dnet:countries @=@ dnet:countries @=@ GL @=@ Greenland
+dnet:countries @=@ dnet:countries @=@ GD @=@ Grenada
+dnet:countries @=@ dnet:countries @=@ GP @=@ Guadeloupe
+dnet:countries @=@ dnet:countries @=@ GU @=@ Guam
+dnet:countries @=@ dnet:countries @=@ GT @=@ Guatemala
+dnet:countries @=@ dnet:countries @=@ GG @=@ Guernsey
+dnet:countries @=@ dnet:countries @=@ GN @=@ Guinea
+dnet:countries @=@ dnet:countries @=@ GW @=@ Guinea-Bissau
+dnet:countries @=@ dnet:countries @=@ GY @=@ Guyana
+dnet:countries @=@ dnet:countries @=@ HT @=@ Haiti
+dnet:countries @=@ dnet:countries @=@ HM @=@ Heard Island and McDonald Islands
+dnet:countries @=@ dnet:countries @=@ VA @=@ Holy See (Vatican City State)
+dnet:countries @=@ dnet:countries @=@ HN @=@ Honduras
+dnet:countries @=@ dnet:countries @=@ HK @=@ Hong Kong
+dnet:countries @=@ dnet:countries @=@ HU @=@ Hungary
+dnet:countries @=@ dnet:countries @=@ IS @=@ Iceland
+dnet:countries @=@ dnet:countries @=@ IN @=@ India
+dnet:countries @=@ dnet:countries @=@ ID @=@ Indonesia
+dnet:countries @=@ dnet:countries @=@ IR @=@ Iran (Islamic Republic of)
+dnet:countries @=@ dnet:countries @=@ IQ @=@ Iraq
+dnet:countries @=@ dnet:countries @=@ IE @=@ Ireland
+dnet:countries @=@ dnet:countries @=@ IM @=@ Isle of Man
+dnet:countries @=@ dnet:countries @=@ IL @=@ Israel
+dnet:countries @=@ dnet:countries @=@ IT @=@ Italy
+dnet:countries @=@ dnet:countries @=@ JM @=@ Jamaica
+dnet:countries @=@ dnet:countries @=@ JP @=@ Japan
+dnet:countries @=@ dnet:countries @=@ JE @=@ Jersey
+dnet:countries @=@ dnet:countries @=@ JO @=@ Jordan
+dnet:countries @=@ dnet:countries @=@ KZ @=@ Kazakhstan
+dnet:countries @=@ dnet:countries @=@ KE @=@ Kenya
+dnet:countries @=@ dnet:countries @=@ KI @=@ Kiribati
+dnet:countries @=@ dnet:countries @=@ KR @=@ Korea (Republic of)
+dnet:countries @=@ dnet:countries @=@ KP @=@ Korea, Democatric People's Republic of
+dnet:countries @=@ dnet:countries @=@ XK @=@ Kosovo * UN resolution
+dnet:countries @=@ dnet:countries @=@ KW @=@ Kuwait
+dnet:countries @=@ dnet:countries @=@ KG @=@ Kyrgyzstan
+dnet:countries @=@ dnet:countries @=@ LA @=@ Lao (People's Democratic Republic)
+dnet:countries @=@ dnet:countries @=@ LV @=@ Latvia
+dnet:countries @=@ dnet:countries @=@ LB @=@ Lebanon
+dnet:countries @=@ dnet:countries @=@ LS @=@ Lesotho
+dnet:countries @=@ dnet:countries @=@ LR @=@ Liberia
+dnet:countries @=@ dnet:countries @=@ LY @=@ Libyan Arab Jamahiriya
+dnet:countries @=@ dnet:countries @=@ LI @=@ Liechtenstein
+dnet:countries @=@ dnet:countries @=@ LT @=@ Lithuania
+dnet:countries @=@ dnet:countries @=@ LU @=@ Luxembourg
+dnet:countries @=@ dnet:countries @=@ MO @=@ Macao
+dnet:countries @=@ dnet:countries @=@ MG @=@ Madagascar
+dnet:countries @=@ dnet:countries @=@ MW @=@ Malawi
+dnet:countries @=@ dnet:countries @=@ MY @=@ Malaysia
+dnet:countries @=@ dnet:countries @=@ MV @=@ Maldives
+dnet:countries @=@ dnet:countries @=@ ML @=@ Mali
+dnet:countries @=@ dnet:countries @=@ MT @=@ Malta
+dnet:countries @=@ dnet:countries @=@ MH @=@ Marshall Islands
+dnet:countries @=@ dnet:countries @=@ MQ @=@ Martinique
+dnet:countries @=@ dnet:countries @=@ MR @=@ Mauritania
+dnet:countries @=@ dnet:countries @=@ MU @=@ Mauritius
+dnet:countries @=@ dnet:countries @=@ YT @=@ Mayotte
+dnet:countries @=@ dnet:countries @=@ MX @=@ Mexico
+dnet:countries @=@ dnet:countries @=@ FM @=@ Micronesia, Federated States of
+dnet:countries @=@ dnet:countries @=@ MD @=@ Moldova (Republic of)
+dnet:countries @=@ dnet:countries @=@ MN @=@ Mongolia
+dnet:countries @=@ dnet:countries @=@ ME @=@ Montenegro
+dnet:countries @=@ dnet:countries @=@ MS @=@ Montserrat
+dnet:countries @=@ dnet:countries @=@ MA @=@ Morocco
+dnet:countries @=@ dnet:countries @=@ MZ @=@ Mozambique
+dnet:countries @=@ dnet:countries @=@ MM @=@ Myanmar
+dnet:countries @=@ dnet:countries @=@ NA @=@ Namibia
+dnet:countries @=@ dnet:countries @=@ NR @=@ Nauru
+dnet:countries @=@ dnet:countries @=@ NP @=@ Nepal
+dnet:countries @=@ dnet:countries @=@ NL @=@ Netherlands
+dnet:countries @=@ dnet:countries @=@ AN @=@ Netherlands Antilles
+dnet:countries @=@ dnet:countries @=@ NC @=@ New Caledonia
+dnet:countries @=@ dnet:countries @=@ NZ @=@ New Zealand
+dnet:countries @=@ dnet:countries @=@ NI @=@ Nicaragua
+dnet:countries @=@ dnet:countries @=@ NE @=@ Niger
+dnet:countries @=@ dnet:countries @=@ NG @=@ Nigeria
+dnet:countries @=@ dnet:countries @=@ NU @=@ Niue
+dnet:countries @=@ dnet:countries @=@ NF @=@ Norfolk Island
+dnet:countries @=@ dnet:countries @=@ MP @=@ Northern Mariana Islands
+dnet:countries @=@ dnet:countries @=@ NO @=@ Norway
+dnet:countries @=@ dnet:countries @=@ OC @=@ Oceania
+dnet:countries @=@ dnet:countries @=@ OM @=@ Oman
+dnet:countries @=@ dnet:countries @=@ PK @=@ Pakistan
+dnet:countries @=@ dnet:countries @=@ PW @=@ Palau
+dnet:countries @=@ dnet:countries @=@ PS @=@ Palestinian-administered areas
+dnet:countries @=@ dnet:countries @=@ PA @=@ Panama
+dnet:countries @=@ dnet:countries @=@ PG @=@ Papua New Guinea
+dnet:countries @=@ dnet:countries @=@ PY @=@ Paraguay
+dnet:countries @=@ dnet:countries @=@ PE @=@ Peru
+dnet:countries @=@ dnet:countries @=@ PH @=@ Philippines
+dnet:countries @=@ dnet:countries @=@ PN @=@ Pitcairn
+dnet:countries @=@ dnet:countries @=@ PL @=@ Poland
+dnet:countries @=@ dnet:countries @=@ PT @=@ Portugal
+dnet:countries @=@ dnet:countries @=@ PR @=@ Puerto Rico
+dnet:countries @=@ dnet:countries @=@ QA @=@ Qatar
+dnet:countries @=@ dnet:countries @=@ RO @=@ Romania
+dnet:countries @=@ dnet:countries @=@ RU @=@ Russian Federation
+dnet:countries @=@ dnet:countries @=@ RW @=@ Rwanda
+dnet:countries @=@ dnet:countries @=@ RE @=@ Réunion
+dnet:countries @=@ dnet:countries @=@ SH @=@ Saint Helena, Ascension and Tristan da Cunha
+dnet:countries @=@ dnet:countries @=@ KN @=@ Saint Kitts and Nevis
+dnet:countries @=@ dnet:countries @=@ LC @=@ Saint Lucia
+dnet:countries @=@ dnet:countries @=@ MF @=@ Saint Martin (French Part)
+dnet:countries @=@ dnet:countries @=@ PM @=@ Saint Pierre and Miquelon
+dnet:countries @=@ dnet:countries @=@ VC @=@ Saint Vincent and the Grenadines
+dnet:countries @=@ dnet:countries @=@ BL @=@ Saint-Barthélemy
+dnet:countries @=@ dnet:countries @=@ WS @=@ Samoa
+dnet:countries @=@ dnet:countries @=@ SM @=@ San Marino
+dnet:countries @=@ dnet:countries @=@ SA @=@ Saudi Arabia
+dnet:countries @=@ dnet:countries @=@ SN @=@ Senegal
+dnet:countries @=@ dnet:countries @=@ RS @=@ Serbia
+dnet:countries @=@ dnet:countries @=@ CS @=@ Serbia and Montenegro
+dnet:countries @=@ dnet:countries @=@ SC @=@ Seychelles
+dnet:countries @=@ dnet:countries @=@ SL @=@ Sierra Leone
+dnet:countries @=@ dnet:countries @=@ SG @=@ Singapore
+dnet:countries @=@ dnet:countries @=@ SX @=@ Sint Maarten (Dutch Part)
+dnet:countries @=@ dnet:countries @=@ SK @=@ Slovakia
+dnet:countries @=@ dnet:countries @=@ SI @=@ Slovenia
+dnet:countries @=@ dnet:countries @=@ SB @=@ Solomon Islands
+dnet:countries @=@ dnet:countries @=@ SO @=@ Somalia
+dnet:countries @=@ dnet:countries @=@ ZA @=@ South Africa
+dnet:countries @=@ dnet:countries @=@ GS @=@ South Georgia and the South Sandwich Islands
+dnet:countries @=@ dnet:countries @=@ SS @=@ South Sudan
+dnet:countries @=@ dnet:countries @=@ ES @=@ Spain
+dnet:countries @=@ dnet:countries @=@ LK @=@ Sri Lanka
+dnet:countries @=@ dnet:countries @=@ SD @=@ Sudan
+dnet:countries @=@ dnet:countries @=@ SR @=@ Suriname
+dnet:countries @=@ dnet:countries @=@ SJ @=@ Svalbard and Jan Mayen
+dnet:countries @=@ dnet:countries @=@ SZ @=@ Swaziland
+dnet:countries @=@ dnet:countries @=@ SE @=@ Sweden
+dnet:countries @=@ dnet:countries @=@ CH @=@ Switzerland
+dnet:countries @=@ dnet:countries @=@ SY @=@ Syrian Arab Republic
+dnet:countries @=@ dnet:countries @=@ ST @=@ São Tomé and Príncipe
+dnet:countries @=@ dnet:countries @=@ TW @=@ Taiwan
+dnet:countries @=@ dnet:countries @=@ TJ @=@ Tajikistan
+dnet:countries @=@ dnet:countries @=@ TZ @=@ Tanzania (United Republic of)
+dnet:countries @=@ dnet:countries @=@ TH @=@ Thailand
+dnet:countries @=@ dnet:countries @=@ TL @=@ Timor-Leste
+dnet:countries @=@ dnet:countries @=@ TG @=@ Togo
+dnet:countries @=@ dnet:countries @=@ TK @=@ Tokelau
+dnet:countries @=@ dnet:countries @=@ TO @=@ Tonga
+dnet:countries @=@ dnet:countries @=@ TT @=@ Trinidad and Tobago
+dnet:countries @=@ dnet:countries @=@ TN @=@ Tunisia
+dnet:countries @=@ dnet:countries @=@ TR @=@ Turkey
+dnet:countries @=@ dnet:countries @=@ TM @=@ Turkmenistan
+dnet:countries @=@ dnet:countries @=@ TC @=@ Turks and Caicos Islands
+dnet:countries @=@ dnet:countries @=@ TV @=@ Tuvalu
+dnet:countries @=@ dnet:countries @=@ UNKNOWN @=@ UNKNOWN
+dnet:countries @=@ dnet:countries @=@ UG @=@ Uganda
+dnet:countries @=@ dnet:countries @=@ UA @=@ Ukraine
+dnet:countries @=@ dnet:countries @=@ AE @=@ United Arab Emirates
+dnet:countries @=@ dnet:countries @=@ GB @=@ United Kingdom
+dnet:countries @=@ dnet:countries @=@ US @=@ United States
+dnet:countries @=@ dnet:countries @=@ UM @=@ United States Minor Outlying Islands
+dnet:countries @=@ dnet:countries @=@ UY @=@ Uruguay
+dnet:countries @=@ dnet:countries @=@ UZ @=@ Uzbekistan
+dnet:countries @=@ dnet:countries @=@ VU @=@ Vanuatu
+dnet:countries @=@ dnet:countries @=@ VE @=@ Venezuela
+dnet:countries @=@ dnet:countries @=@ VN @=@ Viet Nam
+dnet:countries @=@ dnet:countries @=@ VG @=@ Virgin Islands (British)
+dnet:countries @=@ dnet:countries @=@ VI @=@ Virgin Islands, U.S.
+dnet:countries @=@ dnet:countries @=@ WF @=@ Wallis and Futuna
+dnet:countries @=@ dnet:countries @=@ EH @=@ Western Sahara
+dnet:countries @=@ dnet:countries @=@ YE @=@ Yemen
+dnet:countries @=@ dnet:countries @=@ YU @=@ Yugoslavia
+dnet:countries @=@ dnet:countries @=@ ZM @=@ Zambia
+dnet:countries @=@ dnet:countries @=@ ZW @=@ Zimbabwe
+dnet:countries @=@ dnet:countries @=@ AX @=@ Åland Islands
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ openaire2.0 @=@ OpenAIRE 2.0 (EC funding)
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ driver-openaire2.0 @=@ OpenAIRE 2.0+ (DRIVER OA, EC funding)
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ openaire3.0 @=@ OpenAIRE 3.0 (OA, funding)
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ openaire4.0 @=@ OpenAIRE 4.0 (inst.&thematic. repo.)
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ driver @=@ OpenAIRE Basic (DRIVER OA)
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ openaire2.0_data @=@ OpenAIRE Data (funded, referenced datasets)
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ hostedBy @=@ collected from a compatible aggregator
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ UNKNOWN @=@ not available
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ native @=@ proprietary
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ notCompatible @=@ under validation
+dnet:datasourceCompatibilityLevel @=@ dnet:datasourceCompatibilityLevel @=@ openaire-cris_1.1 @=@ OpenAIRE CRIS v1.1
+fct:funding_relations @=@ fct:funding_relations @=@ fct:hasParentFunding @=@ fct:hasParentFunding
+dnet:protocols @=@ dnet:protocols @=@ HTTPWithFileName @=@ HTTPWithFileName
+dnet:protocols @=@ dnet:protocols @=@ NetCDF @=@ NetCDF
+dnet:protocols @=@ dnet:protocols @=@ OpenDAP @=@ OpenDAP
+dnet:protocols @=@ dnet:protocols @=@ schemaorg @=@ Schema.org
+dnet:protocols @=@ dnet:protocols @=@ UNKNOWN @=@ UNKNOWN
+dnet:protocols @=@ dnet:protocols @=@ api @=@ api
+dnet:protocols @=@ dnet:protocols @=@ dataciteESPlugins @=@ dataciteESPlugins
+dnet:protocols @=@ dnet:protocols @=@ datasetsbyjournal @=@ datasetsbyjournal
+dnet:protocols @=@ dnet:protocols @=@ datasetsbyproject @=@ datasetsbyproject
+dnet:protocols @=@ dnet:protocols @=@ excelFile @=@ excelFile
+dnet:protocols @=@ dnet:protocols @=@ file @=@ file
+dnet:protocols @=@ dnet:protocols @=@ fileGzip @=@ fileGzip
+dnet:protocols @=@ dnet:protocols @=@ files_by_rpc @=@ files_by_rpc
+dnet:protocols @=@ dnet:protocols @=@ files_from_mdstore @=@ files_from_mdstore
+dnet:protocols @=@ dnet:protocols @=@ files_from_metadata @=@ files_from_metadata
+dnet:protocols @=@ dnet:protocols @=@ filesystem @=@ filesystem
+dnet:protocols @=@ dnet:protocols @=@ ftp @=@ ftp
+dnet:protocols @=@ dnet:protocols @=@ gristProjects @=@ gristProjects
+dnet:protocols @=@ dnet:protocols @=@ gtr2Projects @=@ gtr2Projects
+dnet:protocols @=@ dnet:protocols @=@ http @=@ http
+dnet:protocols @=@ dnet:protocols @=@ httpCSV @=@ httpCSV
+dnet:protocols @=@ dnet:protocols @=@ httpList @=@ httpList
+dnet:protocols @=@ dnet:protocols @=@ jdbc @=@ jdbc
+dnet:protocols @=@ dnet:protocols @=@ oai @=@ oai
+dnet:protocols @=@ dnet:protocols @=@ oai_sets @=@ oai_sets
+dnet:protocols @=@ dnet:protocols @=@ other @=@ other
+dnet:protocols @=@ dnet:protocols @=@ re3data @=@ re3data
+dnet:protocols @=@ dnet:protocols @=@ rest @=@ rest
+dnet:protocols @=@ dnet:protocols @=@ rest_json2xml @=@ rest_json2xml
+dnet:protocols @=@ dnet:protocols @=@ sftp @=@ sftp
+dnet:protocols @=@ dnet:protocols @=@ soap @=@ soap
+dnet:protocols @=@ dnet:protocols @=@ sparql @=@ sparql
+dnet:protocols @=@ dnet:protocols @=@ sword @=@ sword
+dnet:protocols @=@ dnet:protocols @=@ targz @=@ targz
+dnet:protocols @=@ dnet:protocols @=@ remoteMdstore @=@ remoteMdstore
+wt:funding_typologies @=@ Wellcome Trust: Funding Typologies @=@ wt:fundingStream @=@ Wellcome Trust: Funding Stream
+dnet:externalReference_typologies @=@ dnet:externalReference_typologies @=@ accessionNumber @=@ accessionNumber
+dnet:externalReference_typologies @=@ dnet:externalReference_typologies @=@ dataset @=@ dataset
+dnet:externalReference_typologies @=@ dnet:externalReference_typologies @=@ software @=@ software
+datacite:id_typologies @=@ datacite:id_typologies @=@ ARK @=@ ARK
+datacite:id_typologies @=@ datacite:id_typologies @=@ DOI @=@ DOI
+datacite:id_typologies @=@ datacite:id_typologies @=@ EAN13 @=@ EAN13
+datacite:id_typologies @=@ datacite:id_typologies @=@ EISSN @=@ EISSN
+datacite:id_typologies @=@ datacite:id_typologies @=@ Handle @=@ Handle
+datacite:id_typologies @=@ datacite:id_typologies @=@ ISBN @=@ ISBN
+datacite:id_typologies @=@ datacite:id_typologies @=@ ISSN @=@ ISSN
+datacite:id_typologies @=@ datacite:id_typologies @=@ ISTC @=@ ISTC
+datacite:id_typologies @=@ datacite:id_typologies @=@ LISSN @=@ LISSN
+datacite:id_typologies @=@ datacite:id_typologies @=@ LSID @=@ LSID
+datacite:id_typologies @=@ datacite:id_typologies @=@ PURL @=@ PURL
+datacite:id_typologies @=@ datacite:id_typologies @=@ UNKNOWN @=@ UNKNOWN
+datacite:id_typologies @=@ datacite:id_typologies @=@ UPC @=@ UPC
+datacite:id_typologies @=@ datacite:id_typologies @=@ URL @=@ URL
+datacite:id_typologies @=@ datacite:id_typologies @=@ URN @=@ URN
+dnet:pid_types @=@ dnet:pid_types @=@ actrn @=@ ACTRN Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ nct @=@ ClinicalTrials.gov Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ euctr @=@ EU Clinical Trials Register
+dnet:pid_types @=@ dnet:pid_types @=@ epo_id @=@ European Patent Office application ID
+dnet:pid_types @=@ dnet:pid_types @=@ gsk @=@ GSK Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ GeoPass @=@ Geographic Location-Password Scheme
+dnet:pid_types @=@ dnet:pid_types @=@ GBIF @=@ Global Biodiversity Information Facility
+dnet:pid_types @=@ dnet:pid_types @=@ isrctn @=@ ISRCTN Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ ISNI @=@ International Standard Name Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ jprn @=@ JPRN Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ mag_id @=@ Microsoft Academic Graph Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ oai @=@ Open Archives Initiative
+dnet:pid_types @=@ dnet:pid_types @=@ orcid @=@ Open Researcher and Contributor ID
+dnet:pid_types @=@ dnet:pid_types @=@ PANGAEA @=@ PANGAEA
+dnet:pid_types @=@ dnet:pid_types @=@ epo_nr_epodoc @=@ Patent application number in EPODOC format
+dnet:pid_types @=@ dnet:pid_types @=@ UNKNOWN @=@ UNKNOWN
+dnet:pid_types @=@ dnet:pid_types @=@ VIAF @=@ Virtual International Authority File
+dnet:pid_types @=@ dnet:pid_types @=@ arXiv @=@ arXiv
+dnet:pid_types @=@ dnet:pid_types @=@ doi @=@ doi
+dnet:pid_types @=@ dnet:pid_types @=@ grid @=@ grid
+dnet:pid_types @=@ dnet:pid_types @=@ info:eu-repo/dai @=@ info:eu-repo/dai
+dnet:pid_types @=@ dnet:pid_types @=@ orcidworkid @=@ orcid workid
+dnet:pid_types @=@ dnet:pid_types @=@ pmc @=@ pmc
+dnet:pid_types @=@ dnet:pid_types @=@ pmid @=@ pmid
+dnet:pid_types @=@ dnet:pid_types @=@ urn @=@ urn
+dnet:pid_types @=@ dnet:pid_types @=@ who @=@ WHO Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ drks @=@ DRKS Identifier
+dnet:pid_types @=@ dnet:pid_types @=@ handle @=@ Handle
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/SUBJECT/ACM @=@ An ACM classification term that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/SUBJECT/ARXIV @=@ An ARXIV classification term that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/SUBJECT/DDC @=@ A Dewey Decimal classification term (DDC) that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/SUBJECT/JEL @=@ A Journal of Economic Literature (JEL) classification term that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/OPENACCESS_VERSION @=@ An Open Access versions of your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/DATASET/IS_REFERENCED_BY @=@ A dataset referenced by your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/DATASET/REFERENCES @=@ A dataset that refers to your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/DATASET/IS_RELATED_TO @=@ A dataset related to your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/DATASET/IS_SUPPLEMENTED_TO @=@ A dataset that supplements your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PUBLICATION/IS_RELATED_TO @=@ A publication related to your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PUBLICATION/REFERENCES @=@ A publication referenced by your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PUBLICATION/IS_REFERENCED_BY @=@ A publication that refers to your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PUBLICATION/IS_SUPPLEMENTED_BY @=@ A publication that is supplemented by your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PUBLICATION/IS_SUPPLEMENTED_TO @=@ A publication that supplements your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/SOFTWARE @=@ A software referred by your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/OPENACCESS_VERSION @=@ Another Open Access version of a publication
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/PID @=@ Another persistent identifier associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/SUBJECT/MESHEUROPMC @=@ A classification term from the Medical Subject Headings (MeSH) that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/ABSTRACT @=@ An abstract describing among your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PUBLICATION_DATE @=@ A date of publication missing in your content
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PID @=@ A persistent identifier associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/SUBJECT/ACM @=@ Another ACM classification term that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/SUBJECT/ARXIV @=@ Another ARXIV classification term that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/SUBJECT/DDC @=@ Another Dewey Decimal classification term (DDC) that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/SUBJECT/JEL @=@ Another Journal of Economic Literature (JEL) classification term that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MORE/SUBJECT/MESHEUROPMC @=@ Another classification term from the Medical Subject Headings (MeSH) that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/PROJECT @=@ A project reference that can be associated to your publications
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/DATASET/IS_SUPPLEMENTED_BY @=@ A dataset that is supplemented by your records
+dnet:topic_types @=@ dnet:topic_types @=@ ENRICH/MISSING/AUTHOR/ORCID @=@ An Open Researcher and Contributor ID (ORCID) that can be associated to an author of your publications
+dnet:review_levels @=@ dnet:review_levels @=@ 0000 @=@ Unknown
+dnet:review_levels @=@ dnet:review_levels @=@ 0002 @=@ nonPeerReviewed
+dnet:review_levels @=@ dnet:review_levels @=@ 0001 @=@ peerReviewed
\ No newline at end of file
diff --git a/dhp-schemas/README.md b/dhp-schemas/README.md
deleted file mode 100644
index 7431cda42..000000000
--- a/dhp-schemas/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Description of the project
---------------------------
-This project defines **object schemas** of the OpenAIRE main entities and the relationships that intercur among them.
-Namely it defines the model for
-
-- **research product (result)** which subclasses in publication, dataset, other research product, software
-- **data source** object describing the data provider (institutional repository, aggregators, cris systems)
-- **organization** research bodies managing a data source or participating to a research project
-- **project** research project
-
-Te serialization of such objects (data store files) are used to pass data between workflow nodes in the processing pipeline.
diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml
deleted file mode 100644
index b04d62dd2..000000000
--- a/dhp-schemas/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
- 4.0.0
-
-
- eu.dnetlib.dhp
- dhp
- 1.2.4-SNAPSHOT
- ../
-
-
- dhp-schemas
- jar
-
- This module contains common schema classes meant to be used across the dnet-hadoop submodules
-
-
-
-
- net.alchim31.maven
- scala-maven-plugin
- 4.0.1
-
-
- scala-compile-first
- initialize
-
- add-source
- compile
-
-
-
- scala-test-compile
- process-test-resources
-
- testCompile
-
-
-
-
- ${scala.version}
-
-
-
-
-
-
-
-
-
- commons-io
- commons-io
-
-
-
- org.apache.commons
- commons-lang3
-
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
-
- com.google.guava
- guava
-
-
-
-
-
-
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicAction.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicAction.java
deleted file mode 100644
index 84b22c81c..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicAction.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-package eu.dnetlib.dhp.schema.action;
-
-import java.io.Serializable;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import eu.dnetlib.dhp.schema.oaf.Oaf;
-
-@JsonDeserialize(using = AtomicActionDeserializer.class)
-public class AtomicAction implements Serializable {
-
- private Class clazz;
-
- private T payload;
-
- public AtomicAction() {
- }
-
- public AtomicAction(Class clazz, T payload) {
- this.clazz = clazz;
- this.payload = payload;
- }
-
- public Class getClazz() {
- return clazz;
- }
-
- public void setClazz(Class clazz) {
- this.clazz = clazz;
- }
-
- public T getPayload() {
- return payload;
- }
-
- public void setPayload(T payload) {
- this.payload = payload;
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java
deleted file mode 100644
index 7b88e9c7e..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/action/AtomicActionDeserializer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package eu.dnetlib.dhp.schema.action;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import eu.dnetlib.dhp.schema.oaf.Oaf;
-
-public class AtomicActionDeserializer extends JsonDeserializer {
-
- @Override
- public Object deserialize(JsonParser jp, DeserializationContext ctxt)
- throws IOException {
- JsonNode node = jp.getCodec().readTree(jp);
- String classTag = node.get("clazz").asText();
- JsonNode payload = node.get("payload");
- ObjectMapper mapper = new ObjectMapper();
-
- try {
- final Class clazz = Class.forName(classTag);
- return new AtomicAction(clazz, (Oaf) mapper.readValue(payload.toString(), clazz));
- } catch (ClassNotFoundException e) {
- throw new IOException(e);
- }
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java
deleted file mode 100644
index 54f30cf33..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/EntityType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import eu.dnetlib.dhp.schema.oaf.OafEntity;
-
-/** Actual entity types in the Graph */
-public enum EntityType {
- publication, dataset, otherresearchproduct, software, datasource, organization, project;
-
- /**
- * Resolves the EntityType, given the relative class name
- *
- * @param clazz the given class name
- * @param actual OafEntity subclass
- * @return the EntityType associated to the given class
- */
- public static EntityType fromClass(Class clazz) {
-
- return EntityType.valueOf(clazz.getSimpleName().toLowerCase());
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/LicenseComparator.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/LicenseComparator.java
deleted file mode 100644
index db523ad1a..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/LicenseComparator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import java.util.Comparator;
-
-import eu.dnetlib.dhp.schema.oaf.Qualifier;
-
-public class LicenseComparator implements Comparator {
-
- @Override
- public int compare(Qualifier left, Qualifier right) {
-
- if (left == null && right == null)
- return 0;
- if (left == null)
- return 1;
- if (right == null)
- return -1;
-
- String lClass = left.getClassid();
- String rClass = right.getClassid();
-
- if (lClass.equals(rClass))
- return 0;
-
- if (lClass.equals("OPEN SOURCE"))
- return -1;
- if (rClass.equals("OPEN SOURCE"))
- return 1;
-
- if (lClass.equals("OPEN"))
- return -1;
- if (rClass.equals("OPEN"))
- return 1;
-
- if (lClass.equals("6MONTHS"))
- return -1;
- if (rClass.equals("6MONTHS"))
- return 1;
-
- if (lClass.equals("12MONTHS"))
- return -1;
- if (rClass.equals("12MONTHS"))
- return 1;
-
- if (lClass.equals("EMBARGO"))
- return -1;
- if (rClass.equals("EMBARGO"))
- return 1;
-
- if (lClass.equals("RESTRICTED"))
- return -1;
- if (rClass.equals("RESTRICTED"))
- return 1;
-
- if (lClass.equals("CLOSED"))
- return -1;
- if (rClass.equals("CLOSED"))
- return 1;
-
- if (lClass.equals("UNKNOWN"))
- return -1;
- if (rClass.equals("UNKNOWN"))
- return 1;
-
- // Else (but unlikely), lexicographical ordering will do.
- return lClass.compareTo(rClass);
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/MainEntityType.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/MainEntityType.java
deleted file mode 100644
index cda8ba484..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/MainEntityType.java
+++ /dev/null
@@ -1,7 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-/** Main entity types in the Graph */
-public enum MainEntityType {
- result, datasource, organization, project
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
deleted file mode 100644
index d759f0d55..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java
+++ /dev/null
@@ -1,124 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import eu.dnetlib.dhp.schema.oaf.DataInfo;
-import eu.dnetlib.dhp.schema.oaf.KeyValue;
-import eu.dnetlib.dhp.schema.oaf.Qualifier;
-
-public class ModelConstants {
-
- public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies";
- public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
- public static final String DNET_PUBLICATION_RESOURCE = "dnet:publication_resource";
- public static final String DNET_ACCESS_MODES = "dnet:access_modes";
- public static final String DNET_LANGUAGES = "dnet:languages";
- public static final String DNET_PID_TYPES = "dnet:pid_types";
- public static final String DNET_DATA_CITE_DATE = "dnet:dataCite_date";
- public static final String DNET_DATA_CITE_RESOURCE = "dnet:dataCite_resource";
- public static final String DNET_PROVENANCE_ACTIONS = "dnet:provenanceActions";
- public static final String DNET_COUNTRY_TYPE = "dnet:countries";
- public static final String DNET_REVIEW_LEVELS = "dnet:review_levels";
-
- public static final String SYSIMPORT_CROSSWALK_REPOSITORY = "sysimport:crosswalk:repository";
- public static final String SYSIMPORT_CROSSWALK_ENTITYREGISTRY = "sysimport:crosswalk:entityregistry";
- public static final String USER_CLAIM = "user:claim";
-
- public static final String DATASET_RESULTTYPE_CLASSID = "dataset";
- public static final String PUBLICATION_RESULTTYPE_CLASSID = "publication";
- public static final String SOFTWARE_RESULTTYPE_CLASSID = "software";
- public static final String ORP_RESULTTYPE_CLASSID = "other";
-
- public static final String RESULT_RESULT = "resultResult";
- /**
- * @deprecated Use {@link ModelConstants#RELATIONSHIP} instead.
- */
- @Deprecated
- public static final String PUBLICATION_DATASET = "publicationDataset";
- public static final String IS_RELATED_TO = "isRelatedTo";
- public static final String SUPPLEMENT = "supplement";
- public static final String IS_SUPPLEMENT_TO = "isSupplementTo";
- public static final String IS_SUPPLEMENTED_BY = "isSupplementedBy";
- public static final String PART = "part";
- public static final String IS_PART_OF = "isPartOf";
- public static final String HAS_PARTS = "hasParts";
- public static final String RELATIONSHIP = "relationship";
- public static final String CITATION = "citation";
- public static final String CITES = "cites";
- public static final String IS_CITED_BY = "isCitedBy";
- public static final String REVIEW = "review";
- public static final String REVIEWS = "reviews";
- public static final String IS_REVIEWED_BY = "isReviewedBy";
-
- public static final String RESULT_PROJECT = "resultProject";
- public static final String OUTCOME = "outcome";
- public static final String IS_PRODUCED_BY = "isProducedBy";
- public static final String PRODUCES = "produces";
-
- public static final String DATASOURCE_ORGANIZATION = "datasourceOrganization";
- public static final String PROVISION = "provision";
- public static final String IS_PROVIDED_BY = "isProvidedBy";
- public static final String PROVIDES = "provides";
-
- public static final String PROJECT_ORGANIZATION = "projectOrganization";
- public static final String PARTICIPATION = "participation";
- public static final String HAS_PARTICIPANT = "hasParticipant";
- public static final String IS_PARTICIPANT = "isParticipant";
-
- public static final String RESULT_ORGANIZATION = "resultOrganization";
- public static final String AFFILIATION = "affiliation";
- public static final String IS_AUTHOR_INSTITUTION_OF = "isAuthorInstitutionOf";
- public static final String HAS_AUTHOR_INSTITUTION = "hasAuthorInstitution";
-
- public static final String MERGES = "merges";
-
- public static final String UNKNOWN = "UNKNOWN";
- public static final String NOT_AVAILABLE = "not available";
-
- public static final Qualifier PUBLICATION_DEFAULT_RESULTTYPE = qualifier(
- PUBLICATION_RESULTTYPE_CLASSID, PUBLICATION_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
- public static final Qualifier DATASET_DEFAULT_RESULTTYPE = qualifier(
- DATASET_RESULTTYPE_CLASSID, DATASET_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
- public static final Qualifier SOFTWARE_DEFAULT_RESULTTYPE = qualifier(
- SOFTWARE_RESULTTYPE_CLASSID, SOFTWARE_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
- public static final Qualifier ORP_DEFAULT_RESULTTYPE = qualifier(
- ORP_RESULTTYPE_CLASSID, ORP_RESULTTYPE_CLASSID,
- DNET_RESULT_TYPOLOGIES, DNET_RESULT_TYPOLOGIES);
-
- public static final Qualifier REPOSITORY_PROVENANCE_ACTIONS = qualifier(
- SYSIMPORT_CROSSWALK_REPOSITORY, SYSIMPORT_CROSSWALK_REPOSITORY,
- DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
-
- public static final Qualifier ENTITYREGISTRY_PROVENANCE_ACTION = qualifier(
- SYSIMPORT_CROSSWALK_ENTITYREGISTRY, SYSIMPORT_CROSSWALK_ENTITYREGISTRY,
- DNET_PROVENANCE_ACTIONS, DNET_PROVENANCE_ACTIONS);
-
- public static final KeyValue UNKNOWN_REPOSITORY = keyValue(
- "10|openaire____::55045bd2a65019fd8e6741a755395c8c", "Unknown Repository");
-
- private static Qualifier qualifier(
- final String classid,
- final String classname,
- final String schemeid,
- final String schemename) {
- final Qualifier q = new Qualifier();
- q.setClassid(classid);
- q.setClassname(classname);
- q.setSchemeid(schemeid);
- q.setSchemename(schemename);
- return q;
- }
-
- private static KeyValue keyValue(String key, String value) {
- KeyValue kv = new KeyValue();
- kv.setKey(key);
- kv.setValue(value);
- kv.setDataInfo(new DataInfo());
- return kv;
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
deleted file mode 100644
index b5bca2e93..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/ModelSupport.java
+++ /dev/null
@@ -1,476 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.google.common.collect.Maps;
-
-import eu.dnetlib.dhp.schema.oaf.*;
-
-/** Oaf model utility methods. */
-public class ModelSupport {
-
- /** Defines the mapping between the actual entity type and the main entity type */
- private static Map entityMapping = Maps.newHashMap();
-
- static {
- entityMapping.put(EntityType.publication, MainEntityType.result);
- entityMapping.put(EntityType.dataset, MainEntityType.result);
- entityMapping.put(EntityType.otherresearchproduct, MainEntityType.result);
- entityMapping.put(EntityType.software, MainEntityType.result);
- entityMapping.put(EntityType.datasource, MainEntityType.datasource);
- entityMapping.put(EntityType.organization, MainEntityType.organization);
- entityMapping.put(EntityType.project, MainEntityType.project);
- }
-
- /**
- * Defines the mapping between the actual entity types and the relative classes implementing them
- */
- public static final Map entityTypes = Maps.newHashMap();
-
- static {
- entityTypes.put(EntityType.datasource, Datasource.class);
- entityTypes.put(EntityType.organization, Organization.class);
- entityTypes.put(EntityType.project, Project.class);
- entityTypes.put(EntityType.dataset, Dataset.class);
- entityTypes.put(EntityType.otherresearchproduct, OtherResearchProduct.class);
- entityTypes.put(EntityType.software, Software.class);
- entityTypes.put(EntityType.publication, Publication.class);
- }
-
- public static final Map oafTypes = Maps.newHashMap();
-
- static {
- oafTypes.put("datasource", Datasource.class);
- oafTypes.put("organization", Organization.class);
- oafTypes.put("project", Project.class);
- oafTypes.put("dataset", Dataset.class);
- oafTypes.put("otherresearchproduct", OtherResearchProduct.class);
- oafTypes.put("software", Software.class);
- oafTypes.put("publication", Publication.class);
- oafTypes.put("relation", Relation.class);
- }
-
- public static final Map idPrefixMap = Maps.newHashMap();
-
- static {
- idPrefixMap.put(Datasource.class, "10");
- idPrefixMap.put(Organization.class, "20");
- idPrefixMap.put(Project.class, "40");
- idPrefixMap.put(Dataset.class, "50");
- idPrefixMap.put(OtherResearchProduct.class, "50");
- idPrefixMap.put(Software.class, "50");
- idPrefixMap.put(Publication.class, "50");
- }
-
- public static final Map entityIdPrefix = Maps.newHashMap();
-
- static {
- entityIdPrefix.put("datasource", "10");
- entityIdPrefix.put("organization", "20");
- entityIdPrefix.put("project", "40");
- entityIdPrefix.put("result", "50");
- }
-
- public static final Map idPrefixEntity = Maps.newHashMap();
-
- static {
- idPrefixEntity.put("10", "datasource");
- idPrefixEntity.put("20", "organization");
- idPrefixEntity.put("40", "project");
- idPrefixEntity.put("50", "result");
- }
-
- public static final Map relationInverseMap = Maps.newHashMap();
-
- static {
- relationInverseMap
- .put(
- "personResult_authorship_isAuthorOf", new RelationInverse()
- .setRelation("isAuthorOf")
- .setInverse("hasAuthor")
- .setRelType("personResult")
- .setSubReltype("authorship"));
- relationInverseMap
- .put(
- "personResult_authorship_hasAuthor", new RelationInverse()
- .setInverse("isAuthorOf")
- .setRelation("hasAuthor")
- .setRelType("personResult")
- .setSubReltype("authorship"));
- relationInverseMap
- .put(
- "projectOrganization_participation_isParticipant", new RelationInverse()
- .setRelation("isParticipant")
- .setInverse("hasParticipant")
- .setRelType("projectOrganization")
- .setSubReltype("participation"));
- relationInverseMap
- .put(
- "projectOrganization_participation_hasParticipant", new RelationInverse()
- .setInverse("isParticipant")
- .setRelation("hasParticipant")
- .setRelType("projectOrganization")
- .setSubReltype("participation"));
- relationInverseMap
- .put(
- "resultOrganization_affiliation_hasAuthorInstitution", new RelationInverse()
- .setRelation("hasAuthorInstitution")
- .setInverse("isAuthorInstitutionOf")
- .setRelType("resultOrganization")
- .setSubReltype("affiliation"));
- relationInverseMap
- .put(
- "resultOrganization_affiliation_isAuthorInstitutionOf", new RelationInverse()
- .setInverse("hasAuthorInstitution")
- .setRelation("isAuthorInstitutionOf")
- .setRelType("resultOrganization")
- .setSubReltype("affiliation"));
- relationInverseMap
- .put(
- "organizationOrganization_dedup_merges", new RelationInverse()
- .setRelation("merges")
- .setInverse("isMergedIn")
- .setRelType("organizationOrganization")
- .setSubReltype("dedup"));
- relationInverseMap
- .put(
- "organizationOrganization_dedup_isMergedIn", new RelationInverse()
- .setInverse("merges")
- .setRelation("isMergedIn")
- .setRelType("organizationOrganization")
- .setSubReltype("dedup"));
- relationInverseMap
- .put(
- "organizationOrganization_dedupSimilarity_isSimilarTo", new RelationInverse()
- .setInverse("isSimilarTo")
- .setRelation("isSimilarTo")
- .setRelType("organizationOrganization")
- .setSubReltype("dedupSimilarity"));
-
- relationInverseMap
- .put(
- "resultProject_outcome_isProducedBy", new RelationInverse()
- .setRelation("isProducedBy")
- .setInverse("produces")
- .setRelType("resultProject")
- .setSubReltype("outcome"));
- relationInverseMap
- .put(
- "resultProject_outcome_produces", new RelationInverse()
- .setInverse("isProducedBy")
- .setRelation("produces")
- .setRelType("resultProject")
- .setSubReltype("outcome"));
- relationInverseMap
- .put(
- "projectPerson_contactPerson_isContact", new RelationInverse()
- .setRelation("isContact")
- .setInverse("hasContact")
- .setRelType("projectPerson")
- .setSubReltype("contactPerson"));
- relationInverseMap
- .put(
- "projectPerson_contactPerson_hasContact", new RelationInverse()
- .setInverse("isContact")
- .setRelation("hasContact")
- .setRelType("personPerson")
- .setSubReltype("coAuthorship"));
- relationInverseMap
- .put(
- "personPerson_coAuthorship_isCoauthorOf", new RelationInverse()
- .setInverse("isCoAuthorOf")
- .setRelation("isCoAuthorOf")
- .setRelType("personPerson")
- .setSubReltype("coAuthorship"));
- relationInverseMap
- .put(
- "personPerson_dedup_merges", new RelationInverse()
- .setInverse("isMergedIn")
- .setRelation("merges")
- .setRelType("personPerson")
- .setSubReltype("dedup"));
- relationInverseMap
- .put(
- "personPerson_dedup_isMergedIn", new RelationInverse()
- .setInverse("merges")
- .setRelation("isMergedIn")
- .setRelType("personPerson")
- .setSubReltype("dedup"));
- relationInverseMap
- .put(
- "personPerson_dedupSimilarity_isSimilarTo", new RelationInverse()
- .setInverse("isSimilarTo")
- .setRelation("isSimilarTo")
- .setRelType("personPerson")
- .setSubReltype("dedupSimilarity"));
- relationInverseMap
- .put(
- "datasourceOrganization_provision_isProvidedBy", new RelationInverse()
- .setInverse("provides")
- .setRelation("isProvidedBy")
- .setRelType("datasourceOrganization")
- .setSubReltype("provision"));
- relationInverseMap
- .put(
- "datasourceOrganization_provision_provides", new RelationInverse()
- .setInverse("isProvidedBy")
- .setRelation("provides")
- .setRelType("datasourceOrganization")
- .setSubReltype("provision"));
- relationInverseMap
- .put(
- "resultResult_similarity_hasAmongTopNSimilarDocuments", new RelationInverse()
- .setInverse("isAmongTopNSimilarDocuments")
- .setRelation("hasAmongTopNSimilarDocuments")
- .setRelType("resultResult")
- .setSubReltype("similarity"));
- relationInverseMap
- .put(
- "resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
- .setInverse("hasAmongTopNSimilarDocuments")
- .setRelation("isAmongTopNSimilarDocuments")
- .setRelType("resultResult")
- .setSubReltype("similarity"));
- relationInverseMap
- .put(
- "resultResult_relationship_isRelatedTo", new RelationInverse()
- .setInverse("isRelatedTo")
- .setRelation("isRelatedTo")
- .setRelType("resultResult")
- .setSubReltype("relationship"));
- relationInverseMap
- .put(
- "resultResult_similarity_isAmongTopNSimilarDocuments", new RelationInverse()
- .setInverse("hasAmongTopNSimilarDocuments")
- .setRelation("isAmongTopNSimilarDocuments")
- .setRelType("resultResult")
- .setSubReltype("similarity"));
- relationInverseMap
- .put(
- "resultResult_supplement_isSupplementTo", new RelationInverse()
- .setInverse("isSupplementedBy")
- .setRelation("isSupplementTo")
- .setRelType("resultResult")
- .setSubReltype("supplement"));
- relationInverseMap
- .put(
- "resultResult_supplement_isSupplementedBy", new RelationInverse()
- .setInverse("isSupplementTo")
- .setRelation("isSupplementedBy")
- .setRelType("resultResult")
- .setSubReltype("supplement"));
- relationInverseMap
- .put(
- "resultResult_part_isPartOf", new RelationInverse()
- .setInverse("hasPart")
- .setRelation("isPartOf")
- .setRelType("resultResult")
- .setSubReltype("part"));
- relationInverseMap
- .put(
- "resultResult_part_hasPart", new RelationInverse()
- .setInverse("isPartOf")
- .setRelation("hasPart")
- .setRelType("resultResult")
- .setSubReltype("part"));
- relationInverseMap
- .put(
- "resultResult_dedup_merges", new RelationInverse()
- .setInverse("isMergedIn")
- .setRelation("merges")
- .setRelType("resultResult")
- .setSubReltype("dedup"));
- relationInverseMap
- .put(
- "resultResult_dedup_isMergedIn", new RelationInverse()
- .setInverse("merges")
- .setRelation("isMergedIn")
- .setRelType("resultResult")
- .setSubReltype("dedup"));
- relationInverseMap
- .put(
- "resultResult_dedupSimilarity_isSimilarTo", new RelationInverse()
- .setInverse("isSimilarTo")
- .setRelation("isSimilarTo")
- .setRelType("resultResult")
- .setSubReltype("dedupSimilarity"));
-
- }
-
- private static final String schemeTemplate = "dnet:%s_%s_relations";
-
- private ModelSupport() {
- }
-
- public static String getIdPrefix(Class clazz) {
- return idPrefixMap.get(clazz);
- }
-
- /**
- * Checks subclass-superclass relationship.
- *
- * @param subClazzObject Subclass object instance
- * @param superClazzObject Superclass object instance
- * @param Subclass type
- * @param Superclass type
- * @return True if X is a subclass of Y
- */
- public static Boolean isSubClass(
- X subClazzObject, Y superClazzObject) {
- return isSubClass(subClazzObject.getClass(), superClazzObject.getClass());
- }
-
- /**
- * Checks subclass-superclass relationship.
- *
- * @param subClazzObject Subclass object instance
- * @param superClazz Superclass class
- * @param Subclass type
- * @param Superclass type
- * @return True if X is a subclass of Y
- */
- public static Boolean isSubClass(
- X subClazzObject, Class superClazz) {
- return isSubClass(subClazzObject.getClass(), superClazz);
- }
-
- /**
- * Checks subclass-superclass relationship.
- *
- * @param subClazz Subclass class
- * @param superClazz Superclass class
- * @param Subclass type
- * @param Superclass type
- * @return True if X is a subclass of Y
- */
- public static Boolean isSubClass(
- Class subClazz, Class superClazz) {
- return superClazz.isAssignableFrom(subClazz);
- }
-
- /**
- * Lists all the OAF model classes
- *
- * @param
- * @return
- */
- public static Class[] getOafModelClasses() {
- return new Class[] {
- Author.class,
- Context.class,
- Country.class,
- DataInfo.class,
- Dataset.class,
- Datasource.class,
- ExternalReference.class,
- ExtraInfo.class,
- Field.class,
- GeoLocation.class,
- Instance.class,
- Journal.class,
- KeyValue.class,
- Oaf.class,
- OafEntity.class,
- OAIProvenance.class,
- Organization.class,
- OriginDescription.class,
- OtherResearchProduct.class,
- Project.class,
- Publication.class,
- Qualifier.class,
- Relation.class,
- Result.class,
- Software.class,
- StructuredProperty.class
- };
- }
-
- public static String getMainType(final EntityType type) {
- return entityMapping.get(type).name();
- }
-
- public static boolean isResult(EntityType type) {
- return MainEntityType.result.name().equals(getMainType(type));
- }
-
- public static String getScheme(final String sourceType, final String targetType) {
- return String
- .format(
- schemeTemplate,
- entityMapping.get(EntityType.valueOf(sourceType)).name(),
- entityMapping.get(EntityType.valueOf(targetType)).name());
- }
-
- public static String tableIdentifier(String dbName, String tableName) {
-
- checkArgument(StringUtils.isNotBlank(dbName), "DB name cannot be empty");
- checkArgument(StringUtils.isNotBlank(tableName), "table name cannot be empty");
-
- return String.format("%s.%s", dbName, tableName);
- }
-
- public static String tableIdentifier(String dbName, Class clazz) {
-
- checkArgument(Objects.nonNull(clazz), "clazz is needed to derive the table name, thus cannot be null");
-
- return tableIdentifier(dbName, clazz.getSimpleName().toLowerCase());
- }
-
- public static Function idFn() {
- return x -> {
- if (isSubClass(x, Relation.class)) {
- return idFnForRelation(x);
- }
- return idFnForOafEntity(x);
- };
- }
-
- private static String idFnForRelation(T t) {
- Relation r = (Relation) t;
- return Optional
- .ofNullable(r.getSource())
- .map(
- source -> Optional
- .ofNullable(r.getTarget())
- .map(
- target -> Optional
- .ofNullable(r.getRelType())
- .map(
- relType -> Optional
- .ofNullable(r.getSubRelType())
- .map(
- subRelType -> Optional
- .ofNullable(r.getRelClass())
- .map(
- relClass -> String
- .join(
- source,
- target,
- relType,
- subRelType,
- relClass))
- .orElse(
- String
- .join(
- source,
- target,
- relType,
- subRelType)))
- .orElse(String.join(source, target, relType)))
- .orElse(String.join(source, target)))
- .orElse(source))
- .orElse(null);
- }
-
- private static String idFnForOafEntity(T t) {
- return ((OafEntity) t).getId();
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/RelationInverse.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/RelationInverse.java
deleted file mode 100644
index 4757c637e..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/common/RelationInverse.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-package eu.dnetlib.dhp.schema.common;
-
-public class RelationInverse {
- private String relation;
- private String inverse;
- private String relType;
- private String subReltype;
-
- public String getRelType() {
- return relType;
- }
-
- public RelationInverse setRelType(String relType) {
- this.relType = relType;
- return this;
- }
-
- public String getSubReltype() {
- return subReltype;
- }
-
- public RelationInverse setSubReltype(String subReltype) {
- this.subReltype = subReltype;
- return this;
- }
-
- public String getRelation() {
- return relation;
- }
-
- public RelationInverse setRelation(String relation) {
- this.relation = relation;
- return this;
- }
-
- public String getInverse() {
- return inverse;
- }
-
- public RelationInverse setInverse(String inverse) {
- this.inverse = inverse;
- return this;
- }
-
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java
deleted file mode 100644
index 7f5dcb397..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/APC.java
+++ /dev/null
@@ -1,29 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * Used to refer to the Article Processing Charge information. Not dumped in this release. It contains two parameters: -
- * currency of type String to store the currency of the APC - amount of type String to stores the charged amount
- */
-public class APC implements Serializable {
- private String currency;
- private String amount;
-
- public String getCurrency() {
- return currency;
- }
-
- public void setCurrency(String currency) {
- this.currency = currency;
- }
-
- public String getAmount() {
- return amount;
- }
-
- public void setAmount(String amount) {
- this.amount = amount;
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java
deleted file mode 100644
index f28c544f6..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java
+++ /dev/null
@@ -1,31 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-/**
- * AccessRight. Used to represent the result access rights. It extends the eu.dnet.lib.dhp.schema.dump.oaf.Qualifier
- * element with a parameter scheme of type String to store the scheme. Values for this element are found against the
- * COAR access right scheme. The classid of the element accessright in eu.dnetlib.dhp.schema.oaf.Result is used to get
- * the COAR corresponding code whose value will be used to set the code parameter. The COAR label corresponding to the
- * COAR code will be used to set the label parameter. The scheme value will always be the one referring to the COAR
- * access right scheme
- */
-public class AccessRight extends Qualifier {
-
- private String scheme;
-
- public String getScheme() {
- return scheme;
- }
-
- public void setScheme(String scheme) {
- this.scheme = scheme;
- }
-
- public static AccessRight newInstance(String code, String label, String scheme) {
- AccessRight ar = new AccessRight();
- ar.setCode(code);
- ar.setLabel(label);
- ar.setScheme(scheme);
- return ar;
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java
deleted file mode 100644
index 34920bcf7..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Author.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Used to represent the generic author of the result. It has six parameters: - name of type String to store the given
- * name of the author. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author name - surname of
- * type String to store the family name of the author. The value for this parameter corresponds to
- * eu.dnetlib.dhp.schema.oaf.Author surname - fullname of type String to store the fullname of the author. The value for
- * this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author fullname - rank of type Integer to store the rank on
- * the author in the result's authors list. The value for this parameter corresponds to eu.dnetlib.dhp.schema.oaf.Author
- * rank - pid of type eu.dnetlib.dhp.schema.dump.oaf.Pid to store the persistent identifier for the author. For the
- * moment only ORCID identifiers will be dumped. - The id element is instantiated by using the following values in the
- * eu.dnetlib.dhp.schema.oaf.Result pid: * Qualifier.classid for scheme * value for value - The provenance element is
- * instantiated only if the dataInfo is set for the pid in the result to be dumped. The provenance element is
- * instantiated by using the following values in the eu.dnetlib.dhp.schema.oaf.Result pid: *
- * dataInfo.provenanceaction.classname for provenance * dataInfo.trust for trust
- */
-public class Author implements Serializable {
-
- private String fullname;
-
- private String name;
-
- private String surname;
-
- private Integer rank;
-
- private Pid pid;
-
- public String getFullname() {
- return fullname;
- }
-
- public void setFullname(String fullname) {
- this.fullname = fullname;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getSurname() {
- return surname;
- }
-
- public void setSurname(String surname) {
- this.surname = surname;
- }
-
- public Integer getRank() {
- return rank;
- }
-
- public void setRank(Integer rank) {
- this.rank = rank;
- }
-
- public Pid getPid() {
- return pid;
- }
-
- public void setPid(Pid pid) {
- this.pid = pid;
- }
-
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java
deleted file mode 100644
index 8699528ca..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Container.java
+++ /dev/null
@@ -1,136 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * To store information about the conference or journal where the result has been presented or published. It contains
- * eleven parameters: - name of type String to store the name of the journal or conference. It corresponds to the
- * parameter name of eu.dnetlib.dhp.schema.oaf.Journal - issnPrinted ot type String to store the journal printed issn.
- * It corresponds to the parameter issnPrinted of eu.dnetlib.dhp.schema.oaf.Journal - issnOnline of type String to store
- * the journal online issn. It corresponds to the parameter issnOnline of eu.dnetlib.dhp.schema.oaf.Journal -
- * issnLinking of type String to store the journal linking issn. It corresponds to the parameter issnLinking of
- * eu.dnetlib.dhp.schema.oaf.Journal - ep of type String to store the end page. It corresponds to the parameter ep of
- * eu.dnetlib.dhp.schema.oaf.Journal - iss of type String to store the journal issue. It corresponds to the parameter
- * iss of eu.dnetlib.dhp.schema.oaf.Journal - sp of type String to store the start page. It corresponds to the parameter
- * sp of eu.dnetlib.dhp.schema.oaf.Journal - vol of type String to store the Volume. It corresponds to the parameter vol
- * of eu.dnetlib.dhp.schema.oaf.Journal - edition of type String to store the edition of the journal or conference
- * proceeding. It corresponds to the parameter edition of eu.dnetlib.dhp.schema.oaf.Journal - conferenceplace of type
- * String to store the place of the conference. It corresponds to the parameter conferenceplace of
- * eu.dnetlib.dhp.schema.oaf.Journal - conferencedate of type String to store the date of the conference. It corresponds
- * to the parameter conferencedate of eu.dnetlib.dhp.schema.oaf.Journal
- */
-public class Container implements Serializable {
-
- private String name;
-
- private String issnPrinted;
-
- private String issnOnline;
-
- private String issnLinking;
-
- private String ep;
-
- private String iss;
-
- private String sp;
-
- private String vol;
-
- private String edition;
-
- private String conferenceplace;
-
- private String conferencedate;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIssnPrinted() {
- return issnPrinted;
- }
-
- public void setIssnPrinted(String issnPrinted) {
- this.issnPrinted = issnPrinted;
- }
-
- public String getIssnOnline() {
- return issnOnline;
- }
-
- public void setIssnOnline(String issnOnline) {
- this.issnOnline = issnOnline;
- }
-
- public String getIssnLinking() {
- return issnLinking;
- }
-
- public void setIssnLinking(String issnLinking) {
- this.issnLinking = issnLinking;
- }
-
- public String getEp() {
- return ep;
- }
-
- public void setEp(String ep) {
- this.ep = ep;
- }
-
- public String getIss() {
- return iss;
- }
-
- public void setIss(String iss) {
- this.iss = iss;
- }
-
- public String getSp() {
- return sp;
- }
-
- public void setSp(String sp) {
- this.sp = sp;
- }
-
- public String getVol() {
- return vol;
- }
-
- public void setVol(String vol) {
- this.vol = vol;
- }
-
- public String getEdition() {
- return edition;
- }
-
- public void setEdition(String edition) {
- this.edition = edition;
- }
-
- public String getConferenceplace() {
- return conferenceplace;
- }
-
- public void setConferenceplace(String conferenceplace) {
- this.conferenceplace = conferenceplace;
- }
-
- public String getConferencedate() {
- return conferencedate;
- }
-
- public void setConferencedate(String conferencedate) {
- this.conferencedate = conferencedate;
- }
-
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java
deleted file mode 100644
index cad7b8b5c..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ControlledField.java
+++ /dev/null
@@ -1,38 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-/**
- * To represent the information described by a scheme and a value in that scheme (i.e. pid). It has two parameters: -
- * scheme of type String to store the scheme - value of type String to store the value in that scheme
- */
-public class ControlledField implements Serializable {
- private String scheme;
- private String value;
-
- public String getScheme() {
- return scheme;
- }
-
- public void setScheme(String scheme) {
- this.scheme = scheme;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public static ControlledField newInstance(String scheme, String value) {
- ControlledField cf = new ControlledField();
-
- cf.setScheme(scheme);
- cf.setValue(value);
-
- return cf;
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java
deleted file mode 100644
index 3ab4d90fe..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Country.java
+++ /dev/null
@@ -1,37 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-/**
- * Represents the country associated to this result. It extends eu.dnetlib.dhp.schema.dump.oaf.Qualifier with a
- * provenance parameter of type eu.dnetlib.dhp.schema.dumo.oaf.Provenance. The country in not mapped if its value in the
- * result reprensented in the internal format is Unknown. The value for this element correspond to: - code corresponds
- * to the classid of eu.dnetlib.dhp.schema.oaf.Country - label corresponds to the classname of
- * eu.dnetlib.dhp.schema.oaf.Country - provenance set only if the dataInfo associated to the Country of the result to be
- * dumped is not null. In this case : - provenance corresponds to dataInfo.provenanceaction.classid (to be modified with
- * datainfo.provenanceaction.classname) - trust corresponds to dataInfo.trust
- */
-public class Country extends Qualifier {
-
- private Provenance provenance;
-
- public Provenance getProvenance() {
- return provenance;
- }
-
- public void setProvenance(Provenance provenance) {
- this.provenance = provenance;
- }
-
- public static Country newInstance(String code, String label, Provenance provenance) {
- Country c = new Country();
- c.setProvenance(provenance);
- c.setCode(code);
- c.setLabel(label);
- return c;
- }
-
- public static Country newInstance(String code, String label, String provenance, String trust) {
- return newInstance(code, label, Provenance.newInstance(provenance, trust));
- }
-
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java
deleted file mode 100644
index 16cab22cc..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Funder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-public class Funder implements Serializable {
- private String shortName;
-
- private String name;
-
- private String jurisdiction;
-
- public String getJurisdiction() {
- return jurisdiction;
- }
-
- public void setJurisdiction(String jurisdiction) {
- this.jurisdiction = jurisdiction;
- }
-
- public String getShortName() {
- return shortName;
- }
-
- public void setShortName(String shortName) {
- this.shortName = shortName;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java
deleted file mode 100644
index 6bd891bbd..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/GeoLocation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Represents the geolocation information. It has three parameters: - point of type String to store the point
- * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation point - box ot type String to store the box
- * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation box - place of type String to store the place
- * information. It corresponds to eu.dnetlib.dhp.schema.oaf.GeoLocation place
- */
-public class GeoLocation implements Serializable {
-
- private String point;
-
- private String box;
-
- private String place;
-
- public String getPoint() {
- return point;
- }
-
- public void setPoint(String point) {
- this.point = point;
- }
-
- public String getBox() {
- return box;
- }
-
- public void setBox(String box) {
- this.box = box;
- }
-
- public String getPlace() {
- return place;
- }
-
- public void setPlace(String place) {
- this.place = place;
- }
-
- @JsonIgnore
- public boolean isBlank() {
- return StringUtils.isBlank(point) && StringUtils.isBlank(box) && StringUtils.isBlank(place);
- }
-
-}
diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java
deleted file mode 100644
index 4a09f5a86..000000000
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java
+++ /dev/null
@@ -1,107 +0,0 @@
-
-package eu.dnetlib.dhp.schema.dump.oaf;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Represents the manifestations (i.e. different versions) of the result. For example: the pre-print and the published
- * versions are two manifestations of the same research result. It has the following parameters: - license of type
- * String to store the license applied to the instance. It corresponds to the value of the licence in the instance to be
- * dumped - accessright of type eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store the accessright of the instance. -
- * type of type String to store the type of the instance as defined in the corresponding dnet vocabulary
- * (dnet:pubication_resource). It corresponds to the instancetype.classname of the instance to be mapped - hostedby of
- * type eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance can be
- * viewed or downloaded. It is mapped against the hostedby parameter of the instance to be dumped and - key corresponds
- * to hostedby.key - value corresponds to hostedby.value - url of type List