dimitris.pierrakos
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Pull Requests Activity

changed as extensions of the classes defining the common parameter

This commit is contained in:
Miriam Baglioni 2020-08-19 11:47:17 +02:00
parent 6b8c5034fc
commit c325acef3f
4 changed files with 54 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Funder.java
View File

@ -9,38 +9,38 @@ import java.io.Serializable;
* (e.c. Akademy of Finland) - fundingStream of type String to store the funding stream - jurisdiction of type String to * (e.c. Akademy of Finland) - fundingStream of type String to store the funding stream - jurisdiction of type String to
* store the jurisdiction of the funder * store the jurisdiction of the funder
*/ */
public class Funder implements Serializable { public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {
private String shortName; // private String shortName;
//
private String name; // private String name;
private String fundingStream; private String fundingStream;
private String jurisdiction; // private String jurisdiction;
public String getJurisdiction() { // public String getJurisdiction() {
return jurisdiction; // return jurisdiction;
} // }
//
public void setJurisdiction(String jurisdiction) { // public void setJurisdiction(String jurisdiction) {
this.jurisdiction = jurisdiction; // this.jurisdiction = jurisdiction;
} // }
//
public String getShortName() { // public String getShortName() {
return shortName; // return shortName;
} // }
//
public void setShortName(String shortName) { // public void setShortName(String shortName) {
this.shortName = shortName; // this.shortName = shortName;
} // }
//
public String getName() { // public String getName() {
return name; // return name;
} // }
//
public void setName(String name) { // public void setName(String name) {
this.name = name; // this.name = name;
} // }
public String getFundingStream() { public String getFundingStream() {
return fundingStream; return fundingStream;

45
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/community/Project.java
View File

@ -8,21 +8,14 @@ import eu.dnetlib.dhp.schema.dump.oaf.Provenance;
/** /**
* To store information about the project related to the result. This information is not directly mapped from the result * To store information about the project related to the result. This information is not directly mapped from the result
* represented in the internal model because it is not there. The mapped result will be enriched with project * represented in the internal model because it is not there. The mapped result will be enriched with project
* information derived by relation between results and projects. Project class has the following parameters: - id of * information derived by relation between results and projects.
* type String to store the OpenAIRE id for the Project - code of type String to store the grant agreement - acronym of * Project extends eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters:
* type String to store the acronym for the project - title of type String to store the title of the project - funder of * - funder of
* type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information about the funder funding the project - * type eu.dnetlib.dhp.schema.dump.oaf.community.Funder to store information about the funder funding the project -
* provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store information about the. provenance of the * provenance of type eu.dnetlib.dhp.schema.dump.oaf.Provenance to store information about the. provenance of the
* association between the result and the project * association between the result and the project
*/ */
public class Project implements Serializable { public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {
private String id;// OpenAIRE id
private String code;
private String acronym;
private String title;
private Funder funder; private Funder funder;
@ -36,37 +29,7 @@ public class Project implements Serializable {
this.provenance = provenance; this.provenance = provenance;
} }
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getAcronym() {
return acronym;
}
public void setAcronym(String acronym) {
this.acronym = acronym;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public Funder getFunder() { public Funder getFunder() {
return funder; return funder;

41
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Funder.java
View File

@ -4,46 +4,15 @@ package eu.dnetlib.dhp.schema.dump.oaf.graph;
import java.io.Serializable; import java.io.Serializable;
/** /**
* To store information about the funder funding the project related to the result. It has the following parameters: * To store information about the funder funding the project related to the result. It extends eu.dnetlib.dhp.schema.dump.oaf.Funder
* - private String shortName to store the short name of the funder (e.g. AKA) * with the following parameter: -
* - private String name to store information about the name of the funder (e.g. Akademy of Finland) *
* - private Fundings funding_stream to store the fundingstream * - private eu.dnetdlib.dhp.schema.dump.oaf.graph.Fundings funding_stream to store the fundingstream
* - private String jurisdiction to store information about the jurisdiction of the funder
*/ */
public class Funder implements Serializable { public class Funder extends eu.dnetlib.dhp.schema.dump.oaf.Funder {
private String shortName;
private String name;
private Fundings funding_stream; private Fundings funding_stream;
private String 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;
}
public String getJurisdiction() {
return jurisdiction;
}
public void setJurisdiction(String jurisdiction) {
this.jurisdiction = jurisdiction;
}
public Fundings getFunding_stream() { public Fundings getFunding_stream() {
return funding_stream; return funding_stream;
} }

79
dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Project.java
View File

@ -9,40 +9,27 @@ import eu.dnetlib.dhp.schema.dump.oaf.KeyValue;
/** /**
* This is the class representing the Project in the model used for the dumps of the whole graph. At the moment the dump * 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 * of the Projects differs from the other dumps because we do not create relations between Funders (Organization) and
* Projects but we put the information about the Funder within the Project representation. We also removed the * Projects but we put the information about the Funder within the Project representation. We also removed the collected
* collected from element from the Project. No relation between the Project and the Datasource entity from which it is * from element from the Project. No relation between the Project and the Datasource entity from which it is collected
* collected will be created. We will never create relations between Project and Datasource. In case some relation will * will be created. We will never create relations between Project and Datasource. In case some relation will be
* be extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project, * extracted from the Project they will refer the Funder and will be of type ( organization -> funds -> project, project
* project -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to * -> isFundedBy -> organization) We also removed the duration parameter because the most of times it is set to 0. It extends
* 0. It has the following parameters: * eu.dnetlib.dhp.schema.dump.oaf.Project with the following parameters: - private String
* - private String id to store the id of the project (OpenAIRE id) * websiteurl to store the websiteurl of the project -
* - private String websiteurl to store the websiteurl of the project * private String startdate to store the start date - private String enddate to store the end date - private String
* - private String code to store the grant agreement of the project * callidentifier to store the call indentifier - private String keywords to store the keywords - private boolean
* - private String acronym to store the acronym of the project * openaccessmandateforpublications to store if the project must accomplish to the open access mandate for publications.
* - private String title to store the tile of the project * This value will be set to true if one of the field in the project represented in the internal model is set to true -
* - private String startdate to store the start date * private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for
* - private String enddate to store the end date * dataset. It is set to the value in the corresponding filed of the project represented in the internal model - private
* - private String callidentifier to store the call indentifier * List<String> subject to store the list of subjects of the project - private List<Funder> funding to store the list of
* - private String keywords to store the keywords * funder of the project - private String summary to store the summary of the project - private Granted granted to store
* - private boolean openaccessmandateforpublications to store if the project must accomplish to the open access mandate * the granted amount - private List<Programme> programme to store the list of programmes the project is related to
* for publications. This value will be set to true if one of the field in the project represented in the internal model
* is set to true
* - private boolean openaccessmandatefordataset to store if the project must accomplish to the open access mandate for
* dataset. It is set to the value in the corresponding filed of the project represented in the internal model
* - private List<String> subject to store the list of subjects of the project
* - private List<Funder> funding to store the list of funder of the project
* - private String summary to store the summary of the project
* - private Granted granted to store the granted amount
* - private List<Programme> programme to store the list of programmes the project is related to
*/ */
public class Project implements Serializable { public class Project extends eu.dnetlib.dhp.schema.dump.oaf.Project {
private String id;
private String websiteurl; private String websiteurl;
private String code;
private String acronym;
private String title;
private String startdate; private String startdate;
private String enddate; private String enddate;
@ -64,14 +51,6 @@ public class Project implements Serializable {
private List<Programme> programme; private List<Programme> programme;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWebsiteurl() { public String getWebsiteurl() {
return websiteurl; return websiteurl;
} }
@ -80,30 +59,6 @@ public class Project implements Serializable {
this.websiteurl = websiteurl; this.websiteurl = websiteurl;
} }
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getAcronym() {
return acronym;
}
public void setAcronym(String acronym) {
this.acronym = acronym;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getStartdate() { public String getStartdate() {
return startdate; return startdate;
} }