From f5bae426f70cebe4f6c65dfc271eec78cfc7b7b8 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 19 Aug 2020 11:43:44 +0200 Subject: [PATCH] modified to store information concerning to instance and result common to both the dumps for community and the whole graph --- .../dnetlib/dhp/schema/dump/oaf/Instance.java | 40 +++++-------------- .../dnetlib/dhp/schema/dump/oaf/Result.java | 15 +------ 2 files changed, 11 insertions(+), 44 deletions(-) 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 index 3db9cbe91..2837ea5f3 100644 --- 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 @@ -6,18 +6,16 @@ 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 + * 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 list of locations where the instance - * is accessible. It corresponds to url of the instance to be dumped - collectedfrom of type - * eu.dnetlib.dhp.schema.dump.oaf.KeyValue to store the information about the source from which the instance has been - * collected. It is mapped against the collectedfrom parameter of the instance to be dumped and - key corresponds to - * collectedfrom.key - value corresponds to collectedfrom.value - publicationdate of type String to store the + * 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 + * - 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 String to store information abour tthe * review status of the instance. Possible values are 'Unknown', 'nonPeerReviewed', 'peerReviewed'. It corresponds to * refereed.classname of the instance to be dumped @@ -30,12 +28,8 @@ public class Instance implements Serializable { private String type; - private KeyValue hostedby; - private List url; - private KeyValue collectedfrom; - private String publicationdate;// dateofacceptance; private String refereed; // peer-review status @@ -64,14 +58,6 @@ public class Instance implements Serializable { this.type = type; } - public KeyValue getHostedby() { - return hostedby; - } - - public void setHostedby(KeyValue hostedby) { - this.hostedby = hostedby; - } - public List getUrl() { return url; } @@ -80,14 +66,6 @@ public class Instance implements Serializable { this.url = url; } - public KeyValue getCollectedfrom() { - return collectedfrom; - } - - public void setCollectedfrom(KeyValue collectedfrom) { - this.collectedfrom = collectedfrom; - } - public String getPublicationdate() { return publicationdate; } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java index 97ee72259..acd7c6258 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/Result.java @@ -34,8 +34,7 @@ import eu.dnetlib.dhp.schema.dump.oaf.community.Project; * to the list of coverage.value in the result represented in the internal model - bestaccessright of type * eu.dnetlib.dhp.schema.dump.oaf.AccessRight to store informatin about the openest access right associated to the * manifestations of this research results. It corresponds to the same parameter in the result represented in the - * internal model - instance of type List to store all the instances associated - * to the result. It corresponds to the same parameter in the result represented in the internal model - container of + * internal model - container of * type eu.dnetlib.dhp.schema/dump.oaf.Container (only for result of type publication). It corresponds to the parameter * journal of the result represented in the internal model - documentationUrl of type List (only for results of * type software) to store the URLs to the software documentation. It corresponds to the list of documentationUrl.value @@ -65,7 +64,7 @@ import eu.dnetlib.dhp.schema.dump.oaf.community.Project; * 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 */ -public class Result implements Serializable { +public class Result implements Serializable { private List author; @@ -101,8 +100,6 @@ public class Result implements Serializable { private AccessRight bestaccessright; - private List instance; - private Container container;// Journal private List documentationUrl; // software @@ -309,14 +306,6 @@ public class Result implements Serializable { this.bestaccessright = bestaccessright; } - public List getInstance() { - return instance; - } - - public void setInstance(List instance) { - this.instance = instance; - } - public List getDocumentationUrl() { return documentationUrl; }