diff --git a/pom.xml b/pom.xml index 88a3b1d..e7d0a81 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git scm:git:gitea@code-repo.d4science.org:D-Net/dhp-schemas.git https://code-repo.d4science.org/D-Net/dhp-schemas/ - HEAD + dhp-schemas-2.6.13 This module contains common schema classes meant to be used across the dnet-hadoop submodules diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java index f28c544..b973f5b 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/AccessRight.java @@ -13,6 +13,8 @@ public class AccessRight extends Qualifier { private String scheme; + private OpenAccessRoute openAccessRoute ; + public String getScheme() { return scheme; } @@ -28,4 +30,12 @@ public class AccessRight extends Qualifier { ar.setScheme(scheme); return ar; } + + public OpenAccessRoute getOpenAccessRoute() { + return openAccessRoute; + } + + public void setOpenAccessRoute(OpenAccessRoute openAccessRoute) { + this.openAccessRoute = openAccessRoute; + } } diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java index d0974a1..abfcc2c 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Instance.java @@ -12,14 +12,20 @@ import java.util.List; * 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 - url of type * List list of locations where the instance is accessible. It corresponds to url of the instance to be dumped - - * publicationdate of type String to store the publication date of the instance ;// dateofacceptance; - * - refereed of type + * publicationdate of type String to store the publication date of the instance ;// dateofacceptance; - refereed of type * String to store information abour the review status of the instance. Possible values are 'Unknown', * 'nonPeerReviewed', 'peerReviewed'. It corresponds to refereed.classname of the instance to be dumped * - articleprocessingcharge of type APC to store the article processing charges possibly associated to the instance + * -pid of type List that is the list of pids associated to the result coming from authoritative sources for that pid + * -alternateIdentifier of type List that is the list of pids associated to the result coming from NON authoritative + * sources for that pid */ public class Instance implements Serializable { + private List pid; + + private List alternateIdentifier; + private String license; private AccessRight accessright; @@ -28,10 +34,10 @@ public class Instance implements Serializable { private List url; - private String publicationdate;// dateofacceptance; - private APC articleprocessingcharge; + private String publicationdate;// dateofacceptance; + private String refereed; // peer-review status public String getLicense() { @@ -89,4 +95,20 @@ public class Instance implements Serializable { public void setArticleprocessingcharge(APC articleprocessingcharge) { this.articleprocessingcharge = articleprocessingcharge; } + + public List getPid() { + return pid; + } + + public void setPid(List pid) { + this.pid = pid; + } + + public List getAlternateIdentifier() { + return alternateIdentifier; + } + + public void setAlternateIdentifier(List alternateIdentifier) { + this.alternateIdentifier = alternateIdentifier; + } } diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OpenAccessRoute.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OpenAccessRoute.java new file mode 100644 index 0000000..fbef655 --- /dev/null +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/OpenAccessRoute.java @@ -0,0 +1,13 @@ + +package eu.dnetlib.dhp.schema.dump.oaf; + +/** + * This Enum models the OpenAccess status, currently including only the values from Unpaywall + * + * https://support.unpaywall.org/support/solutions/articles/44001777288-what-do-the-types-of-oa-status-green-gold-hybrid-and-bronze-mean- + */ +public enum OpenAccessRoute { + + gold, green, hybrid, bronze + +} diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java index 88ab2c3..1981776 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java @@ -62,9 +62,12 @@ import eu.dnetlib.dhp.schema.dump.oaf.community.Project; * to store information about the time OpenAIRE collected the record. It corresponds to dateofcollection of the result * represented in the internal model - lasteupdatetimestamp of type String to store the timestamp of the last update of * the record. It corresponds to lastupdatetimestamp of the resord represented in the internal model + * -measure list to represent the measure of beepFinder. It corresponds to measures in the model */ public class Result implements Serializable { + private List measures; + private List author; // resulttype allows subclassing results into publications | datasets | software @@ -376,4 +379,12 @@ public class Result implements Serializable { public void setGeolocation(List geolocation) { this.geolocation = geolocation; } + + public List getMeasures() { + return measures; + } + + public void setMeasures(List measures) { + this.measures = measures; + } } diff --git a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java index ad4ad88..f79cd2a 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java +++ b/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/ResearchInitiative.java @@ -19,7 +19,7 @@ import java.io.Serializable; */ public class ResearchInitiative implements Serializable { private String id; // openaireId - private String originalId; // context id + private String acronym; // context id private String name; // context name private String type; // context type: research initiative or research community private String description; @@ -57,12 +57,12 @@ public class ResearchInitiative implements Serializable { this.name = label; } - public String getOriginalId() { - return originalId; + public String getAcronym() { + return acronym; } - public void setOriginalId(String originalId) { - this.originalId = originalId; + public void setAcronym(String acronym) { + this.acronym = acronym; } public String getDescription() { diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java index c0c14d1..e88ff73 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Measure.java @@ -16,7 +16,7 @@ public class Measure { private String id; /** - * List of units associated with this measure. KeyValue provides a pair to store the laber (key) and the value, plus + * List of units associated with this measure. KeyValue provides a pair to store the label (key) and the value, plus * common provenance information. */ private List unit; diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java index 8d77cf9..6e3ac1a 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java @@ -1,11 +1,11 @@ package eu.dnetlib.dhp.schema.oaf; -import org.apache.commons.lang3.StringUtils; - import java.io.Serializable; import java.util.List; +import org.apache.commons.lang3.StringUtils; + public class Project extends OafEntity implements Serializable { private Field websiteurl;