delegated authorities (Zenodo) #1

Merged
claudio.atzori merged 3 commits from delegated_authorities into master 2021-07-29 17:27:19 +02:00
2 changed files with 16 additions and 10 deletions
Showing only changes of commit aa0c79e0d1 - Show all commits

View File

@ -1,7 +1,10 @@
package eu.dnetlib.dhp.schema.common; package eu.dnetlib.dhp.schema.common;
import eu.dnetlib.dhp.schema.oaf.*; import eu.dnetlib.dhp.schema.oaf.AccessRight;
import eu.dnetlib.dhp.schema.oaf.DataInfo;
import eu.dnetlib.dhp.schema.oaf.KeyValue;
import eu.dnetlib.dhp.schema.oaf.Qualifier;
public class ModelConstants { public class ModelConstants {
@ -24,6 +27,9 @@ public class ModelConstants {
// VOCABULARY VALUE // VOCABULARY VALUE
public static final String ACCESS_RIGHT_OPEN = "OPEN"; public static final String ACCESS_RIGHT_OPEN = "OPEN";
public static final String ACCESS_RIGHT_EMBARGO = "EMBARGO";
public static final String ACCESS_RIGHT_CLOSED = "CLOSED";
public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies"; public static final String DNET_SUBJECT_TYPOLOGIES = "dnet:subject_classification_typologies";
public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies"; public static final String DNET_RESULT_TYPOLOGIES = "dnet:result_typologies";
@ -197,8 +203,8 @@ public class ModelConstants {
return q; return q;
} }
private static KeyValue keyValue(String key, String value) { private static KeyValue keyValue(final String key, final String value) {
KeyValue kv = new KeyValue(); final KeyValue kv = new KeyValue();
kv.setKey(key); kv.setKey(key);
kv.setValue(value); kv.setValue(value);
kv.setDataInfo(new DataInfo()); kv.setDataInfo(new DataInfo());

View File

@ -7,8 +7,8 @@ import java.io.Serializable;
* To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile * To represent entity of type RC/RI. It has the following parameters, which are mostly derived by the profile
* - private * - private
* String id to store the openaire id for the entity. Is has as code 00 and will be created as * String id to store the openaire id for the entity. Is has as code 00 and will be created as
* 00|context_____::md5(acronym) private * 00|context_____::md5(originalId) private
* String acronym to store the id of the context as provided in the profile * String originalId to store the id of the context as provided in the profile
* (i.e. mes) * (i.e. mes)
* - private String name to store the name of the context (got from the label attribute in the context * - private String name to store the name of the context (got from the label attribute in the context
* definition) * definition)
@ -19,7 +19,7 @@ import java.io.Serializable;
*/ */
public class ResearchInitiative implements Serializable { public class ResearchInitiative implements Serializable {
private String id; // openaireId private String id; // openaireId
private String acronym; // context id private String originalId; // context id
private String name; // context name private String name; // context name
private String type; // context type: research initiative or research community private String type; // context type: research initiative or research community
private String description; private String description;
@ -57,12 +57,12 @@ public class ResearchInitiative implements Serializable {
this.name = label; this.name = label;
} }
public String getAcronym() { public String getOriginalId() {
return acronym; return originalId;
} }
public void setAcronym(String acronym) { public void setOriginalId(String originalId) {
this.acronym = acronym; this.originalId = originalId;
} }
public String getDescription() { public String getDescription() {