From c760d1693653ed1b969076466b2ae5456023ed55 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Wed, 29 Jul 2020 16:55:08 +0200
Subject: [PATCH] removed the collected from element from the entities

---
 .../schema/dump/oaf/graph/Organization.java    | 16 ++++++++--------
 .../dhp/schema/dump/oaf/graph/Project.java     | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java
index 71f8e30cf..36d22d6b3 100644
--- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java
+++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/graph/Organization.java
@@ -18,7 +18,7 @@ public class Organization implements Serializable {
 	private Qualifier country;
 	private String id;
 	private List<ControlledField> pid;
-	private List<KeyValue> collectedfrom;
+	// private List<KeyValue> collectedfrom;
 
 	public String getLegalshortname() {
 		return legalshortname;
@@ -76,11 +76,11 @@ public class Organization implements Serializable {
 		this.pid = pid;
 	}
 
-	public List<KeyValue> getCollectedfrom() {
-		return collectedfrom;
-	}
-
-	public void setCollectedfrom(List<KeyValue> collectedfrom) {
-		this.collectedfrom = collectedfrom;
-	}
+//	public List<KeyValue> getCollectedfrom() {
+//		return collectedfrom;
+//	}
+//
+//	public void setCollectedfrom(List<KeyValue> collectedfrom) {
+//		this.collectedfrom = collectedfrom;
+//	}
 }
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 5cc1fb5de..8b40f2916 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,9 +6,11 @@ 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 or let them in the project
 public class Project implements Serializable {
 	private String id;
-	private List<KeyValue> collectedfrom;
+	// private List<KeyValue> collectedfrom;
 	private String websiteurl;
 	private String code;
 	private String acronym;
@@ -172,11 +174,11 @@ public class Project implements Serializable {
 		this.programme = programme;
 	}
 
-	public List<KeyValue> getCollectedfrom() {
-		return collectedfrom;
-	}
-
-	public void setCollectedfrom(List<KeyValue> collectedfrom) {
-		this.collectedfrom = collectedfrom;
-	}
+//	public List<KeyValue> getCollectedfrom() {
+//		return collectedfrom;
+//	}
+//
+//	public void setCollectedfrom(List<KeyValue> collectedfrom) {
+//		this.collectedfrom = collectedfrom;
+//	}
 }