diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java index bc2d1cb08db7..9a8d14f3d658 100644 --- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java +++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java @@ -59,13 +59,15 @@ public void tesGetRecords() throws Exception { ImportRecord record = recordsImported.iterator().next(); - assertThat(record.getValueList(), hasSize(9)); + assertThat(record.getValueList(), hasSize(11)); assertThat( record.getSingleValue("organization.legalName"), is("The University of Texas") ); assertThat(record.getSingleValue("organization.identifier.ror"), is("https://ror.org/02f6dcw23")); + assertThat(record.getSingleValue("organization.alternateName"), is("UTHSCSA")); + assertThat(record.getSingleValue("organization.url"), is("http://www.uthscsa.edu/")); assertThat(record.getSingleValue("dc.type"), is("Education")); assertThat(record.getSingleValue("organization.address.addressCountry"), is("US")); assertThat(record.getSingleValue("organization.foundingDate"), is("1959")); @@ -116,12 +118,15 @@ public void tesGetRecord() throws Exception { context.restoreAuthSystemState(); ImportRecord record = rorServiceImpl.getRecord("https://ror.org/01sps7q28"); - assertThat(record.getValueList(), hasSize(7)); + assertThat(record.getValueList(), hasSize(9)); assertThat( record.getSingleValue("organization.legalName"), is("The University of Texas Health Science Center at Tyler") ); assertThat(record.getSingleValue("organization.identifier.ror"), is("https://ror.org/01sps7q28")); + assertThat(record.getSingleValue("organization.alternateName"), is("UTHSCT")); + assertThat(record.getSingleValue("organization.url"), + is("https://www.utsystem.edu/institutions/university-texas-health-science-center-tyler")); assertThat(record.getSingleValue("dc.type"), is("Healthcare")); assertThat(record.getSingleValue("organization.address.addressCountry"), is("US")); assertThat(record.getSingleValue("organization.foundingDate"), is("1947")); diff --git a/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl b/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl index c96305db1639..7acc3378d62d 100644 --- a/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl +++ b/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl @@ -457,6 +457,13 @@ + + + + + + + diff --git a/dspace/config/modules/orcid.cfg b/dspace/config/modules/orcid.cfg index cde819677447..5b1503034db5 100644 --- a/dspace/config/modules/orcid.cfg +++ b/dspace/config/modules/orcid.cfg @@ -111,6 +111,7 @@ orcid.mapping.organization.city = organization.address.addressLocality orcid.mapping.organization.identifiers = organization.identifier.crossrefid::FUNDREF orcid.mapping.organization.identifiers = organization.identifier.rin::RINGGOLD orcid.mapping.organization.identifiers = organization.identifier.lei::LEI +orcid.mapping.organization.identifiers = organization.identifier.ror::ROR ### Contributor mapping ### orcid.mapping.contributor.email = person.email @@ -128,6 +129,7 @@ orcid.validation.organization.identifier-sources = RINGGOLD orcid.validation.organization.identifier-sources = GRID orcid.validation.organization.identifier-sources = FUNDREF orcid.validation.organization.identifier-sources = LEI +orcid.validation.organization.identifier-sources = ROR #------------------------------------------------------------------# #---------------------ORCID BULK SYNCHRONIZATION-------------------# diff --git a/dspace/config/registries/schema-organization-types.xml b/dspace/config/registries/schema-organization-types.xml index 68214344e55d..e69d29ef24e0 100644 --- a/dspace/config/registries/schema-organization-types.xml +++ b/dspace/config/registries/schema-organization-types.xml @@ -86,6 +86,18 @@ parentOrganization The larger organization that this organization is a subOrganization of, if any. - + + + + organization + alternateName + An alias for the organization. + + + + organization + url + Url of the organization. + diff --git a/dspace/config/spring/api/ror-integration.xml b/dspace/config/spring/api/ror-integration.xml index fd845e2d65ac..ff554612052e 100644 --- a/dspace/config/spring/api/ror-integration.xml +++ b/dspace/config/spring/api/ror-integration.xml @@ -14,7 +14,9 @@ + + @@ -38,6 +40,22 @@ + + + + + + + + + + + + + + + + diff --git a/dspace/config/spring/api/virtual-metadata.xml.openaire4 b/dspace/config/spring/api/virtual-metadata.xml.openaire4 index 6eaf333b0006..da0bd4dd5c17 100644 --- a/dspace/config/spring/api/virtual-metadata.xml.openaire4 +++ b/dspace/config/spring/api/virtual-metadata.xml.openaire4 @@ -167,6 +167,7 @@ + @@ -208,7 +209,13 @@ - + + + + + + + @@ -231,4 +238,11 @@ + + + + organization.identifier.ror + + +