D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 13 Projects 2 Releases 2 Wiki Activity

removed the collected from element from the entities

This commit is contained in:
Miriam Baglioni 2020-07-29 16:55:08 +02:00
parent 6a499c6b7a
commit c760d16936
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ public class Organization implements Serializable {
private Qualifier country; private Qualifier country;
private String id; private String id;
private List<ControlledField> pid; private List<ControlledField> pid;
private List<KeyValue> collectedfrom; // private List<KeyValue> collectedfrom;
public String getLegalshortname() { public String getLegalshortname() {
return legalshortname; return legalshortname;
@ -76,11 +76,11 @@ public class Organization implements Serializable {
this.pid = pid; this.pid = pid;
} }
public List<KeyValue> getCollectedfrom() { // public List<KeyValue> getCollectedfrom() {
return collectedfrom; // return collectedfrom;
} // }
//
public void setCollectedfrom(List<KeyValue> collectedfrom) { // public void setCollectedfrom(List<KeyValue> collectedfrom) {
this.collectedfrom = collectedfrom; // this.collectedfrom = collectedfrom;
} // }
} }

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

@ -6,9 +6,11 @@ import java.util.List;
import eu.dnetlib.dhp.schema.dump.oaf.KeyValue; 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 or let them in the project
public class Project implements Serializable { public class Project implements Serializable {
private String id; private String id;
private List<KeyValue> collectedfrom; // private List<KeyValue> collectedfrom;
private String websiteurl; private String websiteurl;
private String code; private String code;
private String acronym; private String acronym;
@ -172,11 +174,11 @@ public class Project implements Serializable {
this.programme = programme; this.programme = programme;
} }
public List<KeyValue> getCollectedfrom() { // public List<KeyValue> getCollectedfrom() {
return collectedfrom; // return collectedfrom;
} // }
//
public void setCollectedfrom(List<KeyValue> collectedfrom) { // public void setCollectedfrom(List<KeyValue> collectedfrom) {
this.collectedfrom = collectedfrom; // this.collectedfrom = collectedfrom;
} // }
} }