Merge pull request 'Organizations types' (#32) from org_type into master

Reviewed-on: #32

CHANGES.md

@@ -4,6 +4,7 @@
 
 | **Version** | **Changes**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | **Readiness** |
 |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
+| 6.1.1       | [Graph model] </br> <ul><li>Introduced constants used in the DOIBoost dismission.</li></ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | beta          |
 | 6.1.0       | [Graph model] </br> <ul><li>Introduced model classes to provide a JSON representation of records embedding information from the related entities.</li></ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | beta          |
 | 5.17.3      | [Graph model] </br> <ul><li>added result level textual field to store the transformative agreement information.</li></ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        | beta          |
 | 4.17.3      | [Graph model] </br> <ul><li>moved context at the level of the entity. </li></ul>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | beta          |

pom.xml

@@ -5,7 +5,7 @@
     <groupId>eu.dnetlib.dhp</groupId>
     <artifactId>dhp-schemas</artifactId>
     <packaging>jar</packaging>
-    <version>6.1.1-SNAPSHOT</version>
+    <version>6.1.3-SNAPSHOT</version>
 
     <licenses>
         <license>

src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java

@@ -6,6 +6,10 @@ import java.util.List;
 
 public class Organization extends OafEntity implements Serializable {
 
+	enum OrganizationType {
+		Archive, Company, Education, Facility, Government, Healthcare, Nonprofit, Other, Unknown
+	}
+
 	private static final long serialVersionUID = -9048723860770504113L;
 
 	private Field<String> legalshortname;
@@ -40,6 +44,8 @@ public class Organization extends OafEntity implements Serializable {
 
 	private Qualifier country;
 
+	private OrganizationType organizationType;
+
 	public Field<String> getLegalshortname() {
 		return legalshortname;
 	}
@@ -169,4 +175,11 @@ public class Organization extends OafEntity implements Serializable {
 		this.country = country;
 	}
 
+	public OrganizationType getOrganizationType() {
+		return organizationType;
+	}
+
+	public void setOrganizationType(OrganizationType organizationType) {
+		this.organizationType = organizationType;
+	}
 }

src/main/java/eu/dnetlib/dhp/schema/solr/Project.java

@@ -18,6 +18,8 @@ public class Project implements Serializable {
     private String keywords;
     private String duration;
 
+    private String oamandatepublications;
+
     private String ecarticle29_3;
 
     private List<Subject> subjects;
@@ -107,6 +109,14 @@ public class Project implements Serializable {
         this.duration = duration;
     }
 
+    public String getOamandatepublications() {
+        return oamandatepublications;
+    }
+
+    public void setOamandatepublications(String oamandatepublications) {
+        this.oamandatepublications = oamandatepublications;
+    }
+
     public String getEcarticle29_3() {
         return ecarticle29_3;
     }