diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java index aaa320f89e..ab0fa91d37 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java @@ -10,6 +10,7 @@ package org.dspace.app.rest.model; import java.util.UUID; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.dspace.app.rest.RestResourceController; /** @@ -33,6 +34,8 @@ public class RelationshipRest extends BaseObjectRest { private String leftwardValue; private String rightwardValue; + @Override + @JsonProperty(access = JsonProperty.Access.READ_ONLY) public String getType() { return NAME; } diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java index 013bc20dd3..d0921a0b34 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java @@ -249,7 +249,7 @@ public class RelationshipRestRepository extends DSpaceRestRepository map = mapper.readValue(content, Map.class); + String id = String.valueOf(map.get("id")); + + + RelationshipRest relationshipRest = new RelationshipRest(); + relationshipRest.setLeftPlace(0); + relationshipRest.setRightPlace(1); + relationshipRest.setLeftwardValue(null); + relationshipRest.setRightwardValue(null); + //Modify the left item in the relationship publication > publication 2 + MvcResult mvcResult2 = getClient(token).perform(put("/api/core/relationships/" + id) + .contentType(contentType) + .content(mapper.writeValueAsBytes(relationshipRest))) + .andExpect(status().isOk()) + .andReturn(); + + //verify left item change and other not changed + getClient(token).perform(get("/api/core/relationships/" + id)) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.leftPlace", is(0))) + .andExpect(jsonPath("$.rightPlace", is(1))); + + + } + } diff --git a/dspace/config/registries/dspace-dc-types.dtd b/dspace/config/registries/dspace-dc-types.dtd new file mode 100644 index 0000000000..e9c00c67c1 --- /dev/null +++ b/dspace/config/registries/dspace-dc-types.dtd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dspace/config/registries/openaire4-types.xml b/dspace/config/registries/openaire4-types.xml new file mode 100644 index 0000000000..b3290ac120 --- /dev/null +++ b/dspace/config/registries/openaire4-types.xml @@ -0,0 +1,127 @@ + + + + + + + + OpenAIRE4 fields definition + + + + oaire + http://namespace.openaire.eu/schema/oaire/ + + + + datacite + http://datacite.org/schema/kernel-4 + + + + oaire + fundingStream + Name of the funding stream + + + + oaire + awardNumber + Project grantId or awardNumber + + + + oaire + awardURI + URI of the project landing page provided by the funder for more information about the award (grant). + + + + oaire + awardTitle + Title of the project, award or grant. + + + + oaire + version + Use either a version number or the label of the vocabulary term as value. + + + + oaire + citation + title + The title name of the container (e.g. journal, book, conference) this work is published in. This property is considered to be part of the bibliographic citation. + + + + oaire + citation + volume + The volume, typically a number, of the container (e.g. journal). This property is considered to be part of the bibliographic citation. + + + + oaire + citation + issue + The issue of the container (e.g. journal). This property is considered to be part of the bibliographic citation. + + + + oaire + citation + startPage + The start page is part of the pagination information of the work published in a container (e.g. journal issue). This property is considered to be part of the bibliographic citation. + + + + oaire + citation + endPage + The end page is part of the pagination information of the work published in a container (e.g. journal issue). This property is considered to be part of the bibliographic citation. + + + + oaire + citation + edition + The edition the work was published in (e.g. book edition). This property is considered to be part of the bibliographic citation. + + + + oaire + citation + conferencePlace + The place where the conference took place. This property is considered to be part of the bibliographic citation. + + + + oaire + citation + conferenceDate + The date when the conference took place. This property is considered to be part of the bibliographic citation. Recommended best practice for encoding the date value is defined in a profile of ISO 8601 [W3CDTF] and follows the YYYY-MM-DD format. + + + + + datacite + geoLocation + Spatial region or named place where the data was gathered or about which the data is focused. + + + + + datacite + subject + fos + Fields of Science and Technology - OECD + + + diff --git a/dspace/config/registries/schema-organization-types.xml b/dspace/config/registries/schema-organization-types.xml index f169063026..07ff54eb0e 100644 --- a/dspace/config/registries/schema-organization-types.xml +++ b/dspace/config/registries/schema-organization-types.xml @@ -41,5 +41,37 @@ 3166-1 alpha-2 country code. + + + + + + + + organization + identifier + Generic Identifier + + + + organization + identifier + isni + International Standard Name Identifier + + + + organization + identifier + rin + Ringgold identifier + + + + organization + identifier + ror + Research Organization Registry + diff --git a/dspace/config/registries/schema-person-types.xml b/dspace/config/registries/schema-person-types.xml index 61512b6ad0..09cfbb6036 100644 --- a/dspace/config/registries/schema-person-types.xml +++ b/dspace/config/registries/schema-person-types.xml @@ -16,6 +16,10 @@ - person.contributor.other > NOT FOUND --> + person givenName @@ -23,7 +27,11 @@ of the name property. - + + person familyName @@ -64,5 +72,63 @@ jobTitle The job title of the person (for example, Financial Manager). + + + + person + affiliation + name + The organizational or institutional affiliation of the creator + + + + + + + + + person + identifier + scopus-author-id + Scopus Author ID + + + + person + identifier + ciencia-id + Permanent individual means of identification and authentication for citizens carrying out scientific activity. - https://www.ciencia-id.pt/ + + + + person + identifier + gsid + Google Scholar ID + + + + person + identifier + orcid + Open Researcher and Contributor ID + + + + person + identifier + rid + Web of Science ResearcherID + + + + person + identifier + isni + International Standard Name Identifier + \ No newline at end of file diff --git a/dspace/config/registries/schema-project-types.xml b/dspace/config/registries/schema-project-types.xml index 7c78f74c19..df284d709c 100644 --- a/dspace/config/registries/schema-project-types.xml +++ b/dspace/config/registries/schema-project-types.xml @@ -16,5 +16,28 @@ - project.identifier.startdate > NOT FOUND - project.identifier.expectedcompletion > NOT FOUND --> + + + + project + funder + name + Name of the funding provider. + + + + + project + funder + identifier + Unique identifier of the funding entity. + - + \ No newline at end of file