From ca84156658bc8040de2e95e4143112a769d42efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Tue, 12 Nov 2019 09:37:33 +0000 Subject: [PATCH 01/15] OpenAIRE 4 fields --- dspace/config/registries/datacite-types.xml | 29 ++++++ dspace/config/registries/dspace-dc-types.dtd | 26 +++++ dspace/config/registries/openaire4-types.xml | 97 +++++++++++++++++++ .../config/registries/schema-person-types.xml | 21 +++- .../registries/schema-project-types.xml | 23 +++++ 5 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 dspace/config/registries/datacite-types.xml create mode 100644 dspace/config/registries/dspace-dc-types.dtd create mode 100644 dspace/config/registries/openaire4-types.xml diff --git a/dspace/config/registries/datacite-types.xml b/dspace/config/registries/datacite-types.xml new file mode 100644 index 0000000000..6ccc38b142 --- /dev/null +++ b/dspace/config/registries/datacite-types.xml @@ -0,0 +1,29 @@ + + + + + + + + Datacite fields definition + + + + datacite + http://datacite.org/schema/kernel-4 + + + + + + datacite + geoLocation + Spatial region or named place where the data was gathered or about which the data is focused. + + + \ No newline at end of file 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..9334edc214 --- /dev/null +++ b/dspace/config/registries/openaire4-types.xml @@ -0,0 +1,97 @@ + + + + + + + + OpenAIRE4 fields definition + + + + oaire + http://namespace.openaire.eu/schema/oaire/ + + + + 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 + citationTitle + 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 + citationVolume + The volume, typically a number, of the container (e.g. journal). This property is considered to be part of the bibliographic citation. + + + + oaire + citationIssue + The issue of the container (e.g. journal). This property is considered to be part of the bibliographic citation. + + + + oaire + citationStartPage + 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 + citationEndPage + 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 + citationEdition + The edition the work was published in (e.g. book edition). This property is considered to be part of the bibliographic citation. + + + + oaire + citationConferencePlace + The place where the conference took place. This property is considered to be part of the bibliographic citation. + + + + oaire + citationConferenceDate + 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. + + + \ No newline at end of file diff --git a/dspace/config/registries/schema-person-types.xml b/dspace/config/registries/schema-person-types.xml index 61512b6ad0..fde79665ee 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,16 @@ jobTitle The job title of the person (for example, Financial Manager). + + + + person + affiliation + name + The organizational or institutional affiliation of the creator + \ 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..9ea974e3ac 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. + From 4f33932cb4c86dbe6d860ae4737299bee0cfb7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Tue, 12 Nov 2019 11:35:41 +0000 Subject: [PATCH 02/15] New identifiers for Persons, Organizations and Publications --- .../config/registries/dublin-core-types.xml | 198 ++++++++++++++++++ 1 file changed, 198 insertions(+) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 50e79b0d61..3bc66952f9 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -268,6 +268,196 @@ uri Uniform Resource Identifier + + + + + + + + dc + identifier + authorid + Scopus Author ID + + + + dc + identifier + ciencia-id + Permanent individual means of identification and authentication for citizens carrying out scientific activity. - https://www.ciencia-id.pt/ + + + + dc + identifier + gsid + Google Scholar ID + + + + dc + identifier + orcid + Open Researcher and Contributor ID + + + + dc + identifier + rid + Web of Science ResearcherID + + + + dc + identifier + isni + International Standard Name Identifier + + + + dc + identifier + rin + Ringgold identifier + + + + dc + identifier + ror + Research Organization Registry + + + + + + + dc + identifier + ark + Archival Resource Key + + + + dc + identifier + arxiv + arXiv.org identifier + + + + dc + identifier + bibcode + Astrophysics Data System bibliographic codes; bibcodes can be resolved via http://adsabs.harvard.edu/abs/bibcode + + + + dc + identifier + doi + Digital Object Identifier + + + + dc + identifier + ean13 + European Article Number, now renamed International Article Number, but retaining the original acronym, is a 13-digit barcoding standard which is a superset of the original 12-digit Universal Product Code (UPC) system. + + + + dc + identifier + eissn + International Standard Serial Number (electronic Version) + + + + dc + identifier + handle + Handle System Identifier + + + + dc + identifier + igsn + International Geo Sample Number; a 9-digit alphanumeric code that uniquely identifies samples from our natural environment and related sampling features. + + + + dc + identifier + istc + International Standard Text Code; a unique “number” assigned to a textual work. An ISTC consists of 16 numbers and/or letters. + + + + dc + identifier + lissn + The linking ISSN or ISSN-L enables collocation or linking among different media versions of a continuing resource. + + + + dc + identifier + lsid + Life Science Identifiers; a unique identifier for data in the Life Science domain. Format: urn:lsid:authority:namespace:identifier:revision + + + + dc + identifier + pissn + International Standard Serial Number (print version) + + + + dc + identifier + pmid + PubMed ID + + + + dc + identifier + purl + Persistent Uniform Resource Locator + + + + dc + identifier + upc + Universal Product Code is a barcode symbology used for tracking trade items in stores. Its most common form, the UPC-A, consists of 12 numerical digits. + + + + dc + identifier + url + Uniform Resource Locator + + + + dc + identifier + urn + Uniform Resource Name + + + + dc + identifier + wos + Web of Science accession number + @@ -544,6 +734,14 @@ MEdical Subject Headings + + + dc + subject + fos + Fields of Science and Technology - OECD + + dc subject From 182606d67e5d24e6fc3208fde0760130713ceb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Tue, 12 Nov 2019 11:38:44 +0000 Subject: [PATCH 03/15] Indentation --- .../config/registries/dublin-core-types.xml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 3bc66952f9..9256f8c1b8 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -275,56 +275,56 @@ - dc + dc identifier authorid Scopus Author ID - dc + dc identifier ciencia-id Permanent individual means of identification and authentication for citizens carrying out scientific activity. - https://www.ciencia-id.pt/ - dc + dc identifier gsid Google Scholar ID - dc + dc identifier orcid Open Researcher and Contributor ID - dc + dc identifier rid Web of Science ResearcherID - dc + dc identifier isni International Standard Name Identifier - dc + dc identifier rin Ringgold identifier - dc + dc identifier ror Research Organization Registry @@ -334,126 +334,126 @@ - dc + dc identifier ark Archival Resource Key - dc + dc identifier arxiv arXiv.org identifier - dc + dc identifier bibcode Astrophysics Data System bibliographic codes; bibcodes can be resolved via http://adsabs.harvard.edu/abs/bibcode - dc + dc identifier doi Digital Object Identifier - dc + dc identifier ean13 European Article Number, now renamed International Article Number, but retaining the original acronym, is a 13-digit barcoding standard which is a superset of the original 12-digit Universal Product Code (UPC) system. - dc + dc identifier eissn International Standard Serial Number (electronic Version) - dc + dc identifier handle Handle System Identifier - dc + dc identifier igsn International Geo Sample Number; a 9-digit alphanumeric code that uniquely identifies samples from our natural environment and related sampling features. - dc + dc identifier istc International Standard Text Code; a unique “number” assigned to a textual work. An ISTC consists of 16 numbers and/or letters. - dc + dc identifier lissn The linking ISSN or ISSN-L enables collocation or linking among different media versions of a continuing resource. - dc + dc identifier lsid Life Science Identifiers; a unique identifier for data in the Life Science domain. Format: urn:lsid:authority:namespace:identifier:revision - dc + dc identifier pissn International Standard Serial Number (print version) - dc + dc identifier pmid PubMed ID - dc + dc identifier purl Persistent Uniform Resource Locator - dc + dc identifier upc Universal Product Code is a barcode symbology used for tracking trade items in stores. Its most common form, the UPC-A, consists of 12 numerical digits. - dc + dc identifier url Uniform Resource Locator - dc + dc identifier urn Uniform Resource Name - dc + dc identifier wos Web of Science accession number From 077ee4edab971f08e257d23f00e960cb79b8f06f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Tue, 12 Nov 2019 11:44:02 +0000 Subject: [PATCH 04/15] Indentation --- dspace/config/registries/dublin-core-types.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 9256f8c1b8..3c854cae1f 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -736,7 +736,7 @@ - dc + dc subject fos Fields of Science and Technology - OECD From 607859ec3e0d71c6649228682eb2d8829832201a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Tue, 12 Nov 2019 14:14:01 +0000 Subject: [PATCH 05/15] fixing wrong element --- dspace/config/registries/schema-project-types.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dspace/config/registries/schema-project-types.xml b/dspace/config/registries/schema-project-types.xml index 9ea974e3ac..df284d709c 100644 --- a/dspace/config/registries/schema-project-types.xml +++ b/dspace/config/registries/schema-project-types.xml @@ -24,7 +24,7 @@ project funder - name + name Name of the funding provider. @@ -36,8 +36,8 @@ project funder - identifier + identifier Unique identifier of the funding entity. - + \ No newline at end of file From a1d412335263450bc1da0802fcaf660fa10955f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Wed, 13 Nov 2019 14:12:50 +0000 Subject: [PATCH 06/15] adjust MetadatafieldRestRepositoryIT.findall test to cover more metadatafield results --- .../java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java index 49a5995be7..9241f321e7 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java @@ -74,7 +74,7 @@ public class MetadatafieldRestRepositoryIT extends AbstractControllerIntegration context.restoreAuthSystemState(); getClient().perform(get("/api/core/metadatafields") - .param("size", String.valueOf(100))) + .param("size", String.valueOf(110))) .andExpect(status().isOk()) .andExpect(content().contentType(contentType)) .andExpect(jsonPath("$._embedded.metadatafields", Matchers.hasItems( From d0047c8d65f9c91e564f84946a372ed33b87d172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Wed, 13 Nov 2019 14:50:40 +0000 Subject: [PATCH 07/15] adjust MetadatafieldRestRepositoryIT.findall test to cover more metadatafield results --- .../java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java index 9241f321e7..7da2ac1c34 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java @@ -86,7 +86,7 @@ public class MetadatafieldRestRepositoryIT extends AbstractControllerIntegration .andExpect(jsonPath("$._links.next.href", Matchers.containsString("/api/core/metadatafields"))) .andExpect(jsonPath("$._links.last.href", Matchers.containsString("/api/core/metadatafields"))) - .andExpect(jsonPath("$.page.size", is(100))); + .andExpect(jsonPath("$.page.size", is(110))); } @Test From 3eff84a4bd2ca5a7fa8e9f7e6f34e417bd5ee0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Tue, 19 Nov 2019 12:03:45 +0000 Subject: [PATCH 08/15] Separate citation elements into qualifiers --- dspace/config/registries/openaire4-types.xml | 26 +++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dspace/config/registries/openaire4-types.xml b/dspace/config/registries/openaire4-types.xml index 9334edc214..0dfc378509 100644 --- a/dspace/config/registries/openaire4-types.xml +++ b/dspace/config/registries/openaire4-types.xml @@ -48,50 +48,58 @@ oaire - citationTitle + 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 - citationVolume + 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 - citationIssue + citation + issue The issue of the container (e.g. journal). This property is considered to be part of the bibliographic citation. oaire - citationStartPage + 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 - citationEndPage + 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 - citationEdition + 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 - citationConferencePlace + citation + conferencePlace The place where the conference took place. This property is considered to be part of the bibliographic citation. oaire - citationConferenceDate + 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. - \ No newline at end of file + From f7e1bf68966e453b32019cb85f457428c718759a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Mon, 25 Nov 2019 16:05:40 +0000 Subject: [PATCH 09/15] moving DC fields and identifiers into proper Schemas --- dspace/config/registries/datacite-types.xml | 29 --- .../config/registries/dublin-core-types.xml | 192 ------------------ dspace/config/registries/openaire4-types.xml | 24 ++- .../registries/schema-organization-types.xml | 32 +++ .../config/registries/schema-person-types.xml | 49 ++++- .../schema-publicationIssue-types.xml | 144 +++++++++++++ 6 files changed, 247 insertions(+), 223 deletions(-) delete mode 100644 dspace/config/registries/datacite-types.xml diff --git a/dspace/config/registries/datacite-types.xml b/dspace/config/registries/datacite-types.xml deleted file mode 100644 index 6ccc38b142..0000000000 --- a/dspace/config/registries/datacite-types.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - Datacite fields definition - - - - datacite - http://datacite.org/schema/kernel-4 - - - - - - datacite - geoLocation - Spatial region or named place where the data was gathered or about which the data is focused. - - - \ No newline at end of file diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 3c854cae1f..5e8fe5583d 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -269,195 +269,11 @@ Uniform Resource Identifier - - - - - - - dc - identifier - authorid - Scopus Author ID - - - - dc - identifier - ciencia-id - Permanent individual means of identification and authentication for citizens carrying out scientific activity. - https://www.ciencia-id.pt/ - - - dc - identifier - gsid - Google Scholar ID - - - dc - identifier - orcid - Open Researcher and Contributor ID - - - - dc - identifier - rid - Web of Science ResearcherID - - - dc - identifier - isni - International Standard Name Identifier - - - dc - identifier - rin - Ringgold identifier - - - dc - identifier - ror - Research Organization Registry - - - - - - - dc - identifier - ark - Archival Resource Key - - - - dc - identifier - arxiv - arXiv.org identifier - - - - dc - identifier - bibcode - Astrophysics Data System bibliographic codes; bibcodes can be resolved via http://adsabs.harvard.edu/abs/bibcode - - - - dc - identifier - doi - Digital Object Identifier - - - - dc - identifier - ean13 - European Article Number, now renamed International Article Number, but retaining the original acronym, is a 13-digit barcoding standard which is a superset of the original 12-digit Universal Product Code (UPC) system. - - - - dc - identifier - eissn - International Standard Serial Number (electronic Version) - - - - dc - identifier - handle - Handle System Identifier - - - - dc - identifier - igsn - International Geo Sample Number; a 9-digit alphanumeric code that uniquely identifies samples from our natural environment and related sampling features. - - - - dc - identifier - istc - International Standard Text Code; a unique “number” assigned to a textual work. An ISTC consists of 16 numbers and/or letters. - - - - dc - identifier - lissn - The linking ISSN or ISSN-L enables collocation or linking among different media versions of a continuing resource. - - - - dc - identifier - lsid - Life Science Identifiers; a unique identifier for data in the Life Science domain. Format: urn:lsid:authority:namespace:identifier:revision - - - - dc - identifier - pissn - International Standard Serial Number (print version) - - - - dc - identifier - pmid - PubMed ID - - - - dc - identifier - purl - Persistent Uniform Resource Locator - - - - dc - identifier - upc - Universal Product Code is a barcode symbology used for tracking trade items in stores. Its most common form, the UPC-A, consists of 12 numerical digits. - - - - dc - identifier - url - Uniform Resource Locator - - - - dc - identifier - urn - Uniform Resource Name - - - - dc - identifier - wos - Web of Science accession number - @@ -733,14 +549,6 @@ mesh MEdical Subject Headings - - - - dc - subject - fos - Fields of Science and Technology - OECD - dc diff --git a/dspace/config/registries/openaire4-types.xml b/dspace/config/registries/openaire4-types.xml index 9334edc214..0ff76e8fcb 100644 --- a/dspace/config/registries/openaire4-types.xml +++ b/dspace/config/registries/openaire4-types.xml @@ -15,6 +15,11 @@ oaire http://namespace.openaire.eu/schema/oaire/ + + + datacite + http://datacite.org/schema/kernel-4 + oaire @@ -92,6 +97,23 @@ oaire citationConferenceDate 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 + \ No newline at end of file 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 fde79665ee..7cda450cc2 100644 --- a/dspace/config/registries/schema-person-types.xml +++ b/dspace/config/registries/schema-person-types.xml @@ -82,6 +82,53 @@ affiliation name The organizational or institutional affiliation of the creator - + + + + + + + + + person + identifier + authorid + 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-publicationIssue-types.xml b/dspace/config/registries/schema-publicationIssue-types.xml index 9d2c5c54e0..cdcba9ffff 100644 --- a/dspace/config/registries/schema-publicationIssue-types.xml +++ b/dspace/config/registries/schema-publicationIssue-types.xml @@ -27,5 +27,149 @@ delimited by commas. + + + + + + creativework + identifier + ark + Archival Resource Key + + + + creativework + identifier + arxiv + arXiv.org identifier + + + + creativework + identifier + bibcode + Astrophysics Data System bibliographic codes; bibcodes can be resolved via + http://adsabs.harvard.edu/abs/bibcode. + + + + + creativework + identifier + doi + Digital Object Identifier + + + + creativework + identifier + ean13 + European Article Number, now renamed International Article Number, but retaining + the original acronym, is a 13-digit barcoding standard which is a superset of the original + 12-digit Universal Product Code (UPC) system. + + + + + creativework + identifier + eissn + International Standard Serial Number (electronic Version) + + + + creativework + identifier + handle + Handle System Identifier + + + + creativework + identifier + igsn + International Geo Sample Number; a 9-digit alphanumeric code that uniquely identifies + samples from our natural environment and related sampling features. + + + + + creativework + identifier + istc + International Standard Text Code; a unique “number” assigned to a textual work. An + ISTC consists of 16 numbers and/or letters. + + + + + creativework + identifier + lissn + The linking ISSN or ISSN-L enables collocation or linking among different media + versions of a continuing resource. + + + + + creativework + identifier + lsid + Life Science Identifiers; a unique identifier for data in the Life Science domain. + Format: urn:lsid:authority:namespace:identifier:revision + + + + + creativework + identifier + pissn + International Standard Serial Number (print version) + + + + creativework + identifier + pmid + PubMed ID + + + + creativework + identifier + purl + Persistent Uniform Resource Locator + + + + creativework + identifier + upc + Universal Product Code is a barcode symbology used for tracking trade items in stores. + Its most common form, the UPC-A, consists of 12 numerical digits. + + + + + creativework + identifier + url + Uniform Resource Locator + + + + creativework + identifier + urn + Uniform Resource Name + + + + creativework + identifier + wos + Web of Science accession number + From b1e16c71fa00d7c13592e2e793b21b963791cef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Mon, 25 Nov 2019 16:08:44 +0000 Subject: [PATCH 10/15] revert test parameters --- .../org/dspace/app/rest/MetadatafieldRestRepositoryIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java index 7da2ac1c34..49a5995be7 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MetadatafieldRestRepositoryIT.java @@ -74,7 +74,7 @@ public class MetadatafieldRestRepositoryIT extends AbstractControllerIntegration context.restoreAuthSystemState(); getClient().perform(get("/api/core/metadatafields") - .param("size", String.valueOf(110))) + .param("size", String.valueOf(100))) .andExpect(status().isOk()) .andExpect(content().contentType(contentType)) .andExpect(jsonPath("$._embedded.metadatafields", Matchers.hasItems( @@ -86,7 +86,7 @@ public class MetadatafieldRestRepositoryIT extends AbstractControllerIntegration .andExpect(jsonPath("$._links.next.href", Matchers.containsString("/api/core/metadatafields"))) .andExpect(jsonPath("$._links.last.href", Matchers.containsString("/api/core/metadatafields"))) - .andExpect(jsonPath("$.page.size", is(110))); + .andExpect(jsonPath("$.page.size", is(100))); } @Test From d5854256d37d7e1570181aee289bf216376e3af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Wed, 27 Nov 2019 13:15:55 +0000 Subject: [PATCH 11/15] reset dublin-core-types file --- dspace/config/registries/dublin-core-types.xml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml index 5e8fe5583d..50e79b0d61 100644 --- a/dspace/config/registries/dublin-core-types.xml +++ b/dspace/config/registries/dublin-core-types.xml @@ -268,12 +268,6 @@ uri Uniform Resource Identifier - - - - - - @@ -549,7 +543,7 @@ mesh MEdical Subject Headings - + dc subject From fdd6caf9ab71d9105b828a046f4ea4212436d91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Wed, 27 Nov 2019 13:50:38 +0000 Subject: [PATCH 12/15] Removing types of publication ids from schema and change the generic authorid to scopus-author-id --- .../config/registries/schema-person-types.xml | 2 +- .../schema-publicationIssue-types.xml | 146 +----------------- 2 files changed, 2 insertions(+), 146 deletions(-) diff --git a/dspace/config/registries/schema-person-types.xml b/dspace/config/registries/schema-person-types.xml index 7cda450cc2..09cfbb6036 100644 --- a/dspace/config/registries/schema-person-types.xml +++ b/dspace/config/registries/schema-person-types.xml @@ -92,7 +92,7 @@ person identifier - authorid + scopus-author-id Scopus Author ID diff --git a/dspace/config/registries/schema-publicationIssue-types.xml b/dspace/config/registries/schema-publicationIssue-types.xml index cdcba9ffff..7cf9d81c11 100644 --- a/dspace/config/registries/schema-publicationIssue-types.xml +++ b/dspace/config/registries/schema-publicationIssue-types.xml @@ -26,150 +26,6 @@ Keywords or tags used to describe this content. Multiple entries in a keywords list are typically delimited by commas. - - - - - - - creativework - identifier - ark - Archival Resource Key - - - - creativework - identifier - arxiv - arXiv.org identifier - - - - creativework - identifier - bibcode - Astrophysics Data System bibliographic codes; bibcodes can be resolved via - http://adsabs.harvard.edu/abs/bibcode. - - - - - creativework - identifier - doi - Digital Object Identifier - - - - creativework - identifier - ean13 - European Article Number, now renamed International Article Number, but retaining - the original acronym, is a 13-digit barcoding standard which is a superset of the original - 12-digit Universal Product Code (UPC) system. - - - - - creativework - identifier - eissn - International Standard Serial Number (electronic Version) - - - - creativework - identifier - handle - Handle System Identifier - - - - creativework - identifier - igsn - International Geo Sample Number; a 9-digit alphanumeric code that uniquely identifies - samples from our natural environment and related sampling features. - - - - - creativework - identifier - istc - International Standard Text Code; a unique “number” assigned to a textual work. An - ISTC consists of 16 numbers and/or letters. - - - - - creativework - identifier - lissn - The linking ISSN or ISSN-L enables collocation or linking among different media - versions of a continuing resource. - - - - - creativework - identifier - lsid - Life Science Identifiers; a unique identifier for data in the Life Science domain. - Format: urn:lsid:authority:namespace:identifier:revision - - - - - creativework - identifier - pissn - International Standard Serial Number (print version) - - - - creativework - identifier - pmid - PubMed ID - - - - creativework - identifier - purl - Persistent Uniform Resource Locator - - - - creativework - identifier - upc - Universal Product Code is a barcode symbology used for tracking trade items in stores. - Its most common form, the UPC-A, consists of 12 numerical digits. - - - - - creativework - identifier - url - Uniform Resource Locator - - - - creativework - identifier - urn - Uniform Resource Name - - - - creativework - identifier - wos - Web of Science accession number - + From 12b468a366db298d3394beec087d3ed8bd953a7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paulo=20Gra=C3=A7a?= Date: Wed, 27 Nov 2019 13:56:53 +0000 Subject: [PATCH 13/15] remove trailing whitespaces --- dspace/config/registries/schema-publicationIssue-types.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace/config/registries/schema-publicationIssue-types.xml b/dspace/config/registries/schema-publicationIssue-types.xml index 7cf9d81c11..9d2c5c54e0 100644 --- a/dspace/config/registries/schema-publicationIssue-types.xml +++ b/dspace/config/registries/schema-publicationIssue-types.xml @@ -26,6 +26,6 @@ Keywords or tags used to describe this content. Multiple entries in a keywords list are typically delimited by commas. - + From 3c917619f3d8d5d4e173dc9daa788a91340ca5de Mon Sep 17 00:00:00 2001 From: Raf Ponsaerts Date: Tue, 3 Dec 2019 09:50:57 +0100 Subject: [PATCH 14/15] Made a test to prove that the PUT on Relationships with JSON fails --- .../app/rest/model/RelationshipRest.java | 3 ++ .../rest/RelationshipRestRepositoryIT.java | 48 +++++++++++++++++++ 2 files changed, 51 insertions(+) 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/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java index 35693e27e5..1ae88af296 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java @@ -38,6 +38,7 @@ import org.dspace.app.rest.builder.ItemBuilder; import org.dspace.app.rest.builder.RelationshipBuilder; import org.dspace.app.rest.matcher.PageMatcher; import org.dspace.app.rest.matcher.RelationshipMatcher; +import org.dspace.app.rest.model.RelationshipRest; import org.dspace.app.rest.test.AbstractEntityIntegrationTest; import org.dspace.authorize.service.AuthorizeService; import org.dspace.content.Collection; @@ -2435,5 +2436,52 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest matchMetadata("dc.title", "Publication1")))); } + @Test + public void putRelationshipWithJson() throws Exception { + + String token = getAuthToken(admin.getEmail(), password); + + MvcResult mvcResult = getClient(token).perform(post("/api/core/relationships") + .param("relationshipType", + isAuthorOfPublicationRelationshipType.getID() + .toString()) + .contentType(MediaType.parseMediaType + (org.springframework.data.rest.webmvc.RestMediaTypes + .TEXT_URI_LIST_VALUE)) + .content( + "https://localhost:8080/server/api/core/items/" + publication1 + .getID() + "\n" + + "https://localhost:8080/server/api/core/items/" + author1 + .getID())) + .andExpect(status().isCreated()) + .andReturn(); + + ObjectMapper mapper = new ObjectMapper(); + String content = mvcResult.getResponse().getContentAsString(); + Map 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))); + + + } + } From bf3796874d93242463d74205f4e2d6a626163ff3 Mon Sep 17 00:00:00 2001 From: Raf Ponsaerts Date: Tue, 3 Dec 2019 10:20:23 +0100 Subject: [PATCH 15/15] Fixed the bug in the PUT endpoint for Relationships --- .../dspace/app/rest/repository/RelationshipRestRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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