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 ac1dae382..317fab1b1 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 @@ -28,6 +28,8 @@ public class Result implements Serializable { private String publicationdate; // dateofacceptance; + private List fulltext; + private String publisher; private String embargoenddate; @@ -76,6 +78,14 @@ public class Result implements Serializable { private Long lastupdatetimestamp; + public List getFulltext() { + return fulltext; + } + + public void setFulltext(List fulltext) { + this.fulltext = fulltext; + } + public Long getLastupdatetimestamp() { return lastupdatetimestamp; } diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java index a92311b0e..ae02f0595 100644 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java @@ -6,12 +6,20 @@ import java.util.List; import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; -//At the moment the funder is map in the project. -//We will reserve to decide if to create specific entities for funders (and related relations to the organization) -// or let them in the project +/** + * This is the class representing the Project in the model used for the dumps of the whole graph. At the moment the dump + * of the Projects differs from the other dumps because we do not create relations between Funders (Organization) and + * Projects but to take the information about the Funder within the Project representation. We also removed the + * collected from element from the Project. No relation between the Project and the Datasource entity from which it is + * collected will be created. We will never create relations between Project and Datasource. In case some relation will + * be extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project, + * project -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to + * 0 + */ + public class Project implements Serializable { private String id; - // private List collectedfrom; + private String websiteurl; private String code; private String acronym; @@ -24,8 +32,6 @@ public class Project implements Serializable { private String keywords; - // private String duration; removed because the most of the times is set to 0 - private boolean openaccessmandateforpublications; private boolean openaccessmandatefordataset; @@ -111,14 +117,6 @@ public class Project implements Serializable { this.keywords = keywords; } -// public String getDuration() { -// return duration; -// } -// -// public void setDuration(String duration) { -// this.duration = duration; -// } - public boolean isOpenaccessmandateforpublications() { return openaccessmandateforpublications; } @@ -175,11 +173,4 @@ public class Project implements Serializable { this.programme = programme; } -// public List getCollectedfrom() { -// return collectedfrom; -// } -// -// public void setCollectedfrom(List collectedfrom) { -// this.collectedfrom = collectedfrom; -// } }