Skip to content

Commit 4b2f35b

Browse files
vins01-4sciencevins01-4science
committed
Merge branch 'task/dspace-cris-2024_02_x/DSC-2537' into dspace-cris-2024_02_x
2 parents dee3c8f + 93ef02f commit 4b2f35b

File tree

8 files changed

+56
-66
lines changed

8 files changed

+56
-66
lines changed

‎dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void testSearchWithoutPagination() throws Exception {
149149
assertThat(metadata, has(metadata("dc.date.issued", "2011")));
150150
assertThat(metadata, has(metadata("dc.source", "Test Journal")));
151151
assertThat(metadata, has(metadata("dc.language.iso", "it")));
152-
assertThat(metadata, has(metadata("dc.type", "Controlled Vocabulary for Resource Type Genres::other")));
152+
assertThat(metadata, has(metadata("dc.type", "other")));
153153
assertThat(metadata, has(metadata("dc.identifier.doi", "10.11234.12")));
154154
assertThat(metadata, has(metadata("dc.contributor.author", "Walter White")));
155155
assertThat(metadata, has(metadata("dc.title", "The elements of style and the survey of ophthalmology.")));
@@ -169,8 +169,7 @@ public void testSearchWithoutPagination() throws Exception {
169169
assertThat(metadata, has(metadata("dc.contributor.author", "John White")));
170170
assertThat(metadata, has(metadata("dc.contributor.editor", "Jesse Pinkman")));
171171
assertThat(metadata, has(metadata("dc.title", "Another cautionary tale.")));
172-
assertThat(metadata, has(metadata("dc.type", "Controlled Vocabulary for "
173-
+ "Resource Type Genres::text::periodical::journal")));
172+
assertThat(metadata, has(metadata("dc.type", "text::journal::journal article")));
174173

175174
ExternalDataObject thirdObject = externalObjects.get(2);
176175
assertThat(thirdObject.getDisplayValue(), is("Branch artery occlusion in a young woman."));
@@ -182,8 +181,7 @@ public void testSearchWithoutPagination() throws Exception {
182181
assertThat(metadata, hasSize(3));
183182
assertThat(metadata, has(metadata("dc.date.issued", "1985-07-01")));
184183
assertThat(metadata, has(metadata("dc.title", "Branch artery occlusion in a young woman.")));
185-
assertThat(metadata, has(metadata("dc.type", "Controlled Vocabulary for "
186-
+ "Resource Type Genres::text::periodical::journal")));
184+
assertThat(metadata, has(metadata("dc.type", "text::journal::journal article")));
187185

188186
verify(orcidClientMock).getReadPublicAccessToken();
189187
verify(orcidClientMock).getWorks(ACCESS_TOKEN, ORCID);
@@ -353,8 +351,7 @@ public void testGetExternalDataObject() {
353351
assertThat(metadata, has(metadata("dc.contributor.author", "John White")));
354352
assertThat(metadata, has(metadata("dc.contributor.editor", "Jesse Pinkman")));
355353
assertThat(metadata, has(metadata("dc.title", "Another cautionary tale.")));
356-
assertThat(metadata, has(metadata("dc.type", "Controlled Vocabulary for "
357-
+ "Resource Type Genres::text::periodical::journal")));
354+
assertThat(metadata, has(metadata("dc.type", "text::journal::journal article")));
358355

359356
verify(orcidClientMock).getReadPublicAccessToken();
360357
verify(orcidClientMock).getObject(ACCESS_TOKEN, ORCID, "277902", Work.class);

‎dspace-api/src/test/java/org/dspace/orcid/script/OrcidBulkPushIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ private Item createOwnerItem(String orcid, OrcidSynchronizationMode mode, EPerso
530530
private Item createPublication(String title) {
531531
return ItemBuilder.createItem(context, publicationCollection)
532532
.withTitle(title)
533-
.withType("Controlled Vocabulary for Resource Type Genres::dataset")
533+
.withType("text::journal::data paper")
534534
.build();
535535
}
536536

‎dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void testWorkCreation() {
149149
.withIssueDate("2021-04-30")
150150
.withDescriptionAbstract("Publication description")
151151
.withLanguage("en_US")
152-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
152+
.withType("text::book")
153153
.withIsPartOf("Journal")
154154
.withDoiIdentifier("doi-id")
155155
.withScopusIdentifier("scopus-id")
@@ -321,7 +321,7 @@ public void testWorkWithFundingCreation() {
321321
.withTitle("Test publication")
322322
.withAuthor("Walter White")
323323
.withIssueDate("2021-04-30")
324-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
324+
.withType("text::book")
325325
.withRelationFunding("Test funding")
326326
.withRelationGrantno("123456")
327327
.build();
@@ -400,7 +400,7 @@ public void testWorkWithFundingWithoutGrantNumberCreation() {
400400
.withTitle("Test publication")
401401
.withAuthor("Walter White")
402402
.withIssueDate("2021-04-30")
403-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
403+
.withType("text::book")
404404
.withRelationFunding("Test funding")
405405
.build();
406406

@@ -472,7 +472,7 @@ public void testWorkWithFundingWithGrantNumberPlaceholderCreation() {
472472
.withTitle("Test publication")
473473
.withAuthor("Walter White")
474474
.withIssueDate("2021-04-30")
475-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
475+
.withType("text::book")
476476
.withRelationFunding("Test funding")
477477
.withRelationGrantno(CrisConstants.PLACEHOLDER_PARENT_METADATA_VALUE)
478478
.build();
@@ -553,7 +553,7 @@ public void testWorkWithFundingEntityWithoutGrantNumberCreation() {
553553
.withTitle("Test publication")
554554
.withAuthor("Walter White")
555555
.withIssueDate("2021-04-30")
556-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
556+
.withType("text::book")
557557
.withRelationFunding("Test funding", funding.getID().toString())
558558
.withRelationGrantno("123456")
559559
.build();
@@ -648,7 +648,7 @@ public void testWorkWithFundingEntityWithGrantNumberCreation() {
648648
.withTitle("Test publication")
649649
.withAuthor("Walter White")
650650
.withIssueDate("2021-04-30")
651-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
651+
.withType("text::book")
652652
.withRelationFunding("Test funding", funding.getID().toString())
653653
.withRelationGrantno("123456")
654654
.build();
@@ -752,7 +752,7 @@ public void testWorkWithFundingEntityWithGrantNumberAndUrlCreation() {
752752
.withTitle("Test publication")
753753
.withAuthor("Walter White")
754754
.withIssueDate("2021-04-30")
755-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
755+
.withType("text::book")
756756
.withRelationFunding("Test funding", funding.getID().toString())
757757
.withRelationGrantno("123456")
758758
.build();

‎dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidHistoryRestRepositoryIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void setup() throws SQLException, AuthorizeException {
138138
.withAuthor("Josiah, Carberry")
139139
.withTitle("A Methodology for the Emulation of Architecture")
140140
.withIssueDate("2013-08-03")
141-
.withType("Controlled Vocabulary for Resource Type Genres::text::book")
141+
.withType("text::book")
142142
.withDoiIdentifier("10.1000/182")
143143
.build();
144144

‎dspace/config/crosswalks/orcid/mapConverter-dspace-to-orcid-publication-type.properties‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,33 @@
11
# Mapping between DSpace common publication's types and the type supported by ORCID
2-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:interactive\ resource\:\:website = website
3-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:dataset = data-set
4-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:dataset\:\:interview = data-set
5-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:book = book
6-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:book\:\:book\ part = book-chapter
7-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:conference\ object = conference-paper
8-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:conference\ object\:\:conference\ proceedings = conference-paper
9-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:conference\ object\:\:conference\ proceedings\:\:conference\ paper = conference-paper
10-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:conference\ object\:\:conference\ proceedings\:\:conference\ poster = conference-paper
11-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:conference\ object\:\:conference\ paper\ not\ in\ proceedings = conference-paper
12-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:conference\ object\:\:conference\ poster\ not\ in\ proceedings = conference-paper
13-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal = journal-article
14-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal = journal-article
15-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:journal\ article = journal-article
16-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:journal\ article\:\:data\ paper = journal-article
17-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:journal\ article\:\:review\ article = journal-article
18-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:journal\ article\:\:research\ article = journal-article
19-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:journal\ article\:\:corrigendum = journal-article
20-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:journal\ article\:\:software\ paper = journal-article
21-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:editorial = journal-article
22-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:contribution\ to\ journal\:\:letter\ to\ the\ editor = journal-article
23-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:newspaper = newspaper-article
24-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:newspaper\:\:newspaper\ article = newspaper-article
25-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:periodical\:\:journal\:\:magazine = magazine-article
26-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:patent = patent
27-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report = report
28-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:report\ part = report
29-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:internal\ report = report
30-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:memorandum = report
31-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:other\ type\ of\ report = report
32-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:policy\ report = report
33-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:project\ deliverable = report
34-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:project\ deliverable\:\:data\ management\ plan = report
35-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:report\ to\ funding\ agency = report
36-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:research\ report = report
37-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:report\:\:technical\ report = report
38-
Controlled\ Vocabulary\ for\ Resource\ Type\ Genres\:\:text\:\:review\:\:book\ review = book-review
2+
text\:\:journal\:\:data\ paper = data-set
3+
text\:\:book = book
4+
text\:\:book\:\:book\ part = book-chapter
5+
6+
text\:\:conference\ output\:\:conference\ proceedings = conference-paper
7+
text\:\:conference\ output\:\:conference\ proceedings\:\:conference\ paper = conference-paper
8+
text\:\:conference\ output\:\:conference\ proceedings\:\:conference\ poster = conference-paper
9+
text\:\:conference\ output\:\:conference\ poster\ not\ in\ proceedings = conference-paper
10+
text\:\:conference\ output\:\:conference\ paper\ not\ in\ proceedings = conference-paper
11+
12+
text\:\:journal\:\:journal\ article = journal-article
13+
text\:\:journal\:\:journal\ article\:\:data\ paper = journal-article
14+
text\:\:journal\:\:journal\ article\:\:review\ article = journal-article
15+
text\:\:journal\:\:journal\ article\:\:research\ article = journal-article
16+
text\:\:journal\:\:journal\ article\:\:corrigendum = journal-article
17+
text\:\:journal\:\:journal\ article\:\:software\ paper = journal-article
18+
19+
text\:\:newspaper = newspaper-article
20+
text\:\:newspaper\:\:newspaper\ article = newspaper-article
21+
text\:\:magazine = magazine-article
22+
23+
text\:\:report = report
24+
text\:\:report\:\:clinical\ study = report
25+
text\:\:report\:\:data\ management = report
26+
text\:\:report\:\:memorandum = report
27+
text\:\:report\:\:policy\ report = report
28+
text\:\:report\:\:project\ deliverable = report
29+
text\:\:report\:\:research\ protocol = report
30+
text\:\:report\:\:research\ report = report
31+
text\:\:report\:\:technical\ report = report
32+
33+
text\:\:review\:\:book\ review = book-review

‎dspace/config/crosswalks/orcid/mapConverter-orcid-to-dspace-publication-type.properties‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Mapping between work type supported by ORCID and the DSpace common publication's types
2-
website = Controlled Vocabulary for Resource Type Genres::interactive resource::website
3-
data-set = Controlled Vocabulary for Resource Type Genres::dataset
4-
book = Controlled Vocabulary for Resource Type Genres::text::book
5-
book-chapter = Controlled Vocabulary for Resource Type Genres::text::book::book part
6-
conference-paper = Controlled Vocabulary for Resource Type Genres::text::conference object
7-
journal-article = Controlled Vocabulary for Resource Type Genres::text::periodical::journal
8-
newspaper-article = Controlled Vocabulary for Resource Type Genres::text::periodical::journal::newspaper
9-
magazine-article = Controlled Vocabulary for Resource Type Genres::text::periodical::journal::magazine
10-
patent = Controlled Vocabulary for Resource Type Genres::text::patent
11-
report = Controlled Vocabulary for Resource Type Genres::text::report
12-
book-review = Controlled Vocabulary for Resource Type Genres::text::review::book review
2+
data-set = text::journal::data paper
3+
book = text::book
4+
book-chapter = text::book::book part
5+
conference-paper = text::conference output::conference proceedings::conference paper
6+
journal-article = text::journal::journal article
7+
newspaper-article = text::newspaper::newspaper article
8+
magazine-article = text::magazine
9+
report = text::report
10+
book-review = text::review::book review

‎dspace/config/spring/api/crosswalks.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@
670670
<bean name="mapConverterCoarToPublicationTypes" class="org.dspace.util.SimpleMapConverter" init-method="init">
671671
<property name="converterNameFile" value="mapConverter-coarToPublicationTypes.properties" />
672672
<property name="configurationService" ref="org.dspace.services.ConfigurationService" />
673-
<property name="defaultValue" value="Controlled Vocabulary for Resource Type Genres::other"/>
673+
<property name="defaultValue" value="other"/>
674674
</bean>
675675

676676
<bean name="mapConverterCerifToOrgUnitTypes" class="org.dspace.util.SimpleMapConverter" init-method="init">

‎dspace/config/spring/api/orcid-services.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
<bean name="mapConverterOrcidToDSpacePublicationType" class="org.dspace.util.SimpleMapConverter" init-method="init">
281281
<property name="converterNameFile" value="orcid/mapConverter-orcid-to-dspace-publication-type.properties" />
282282
<property name="configurationService" ref="org.dspace.services.ConfigurationService" />
283-
<property name="defaultValue" value="Controlled Vocabulary for Resource Type Genres::other"/>
283+
<property name="defaultValue" value="other"/>
284284
</bean>
285285

286286
<bean name="mapConverterOrcidToDSpaceLanguageCode" class="org.dspace.util.SimpleMapConverter" init-method="init">

0 commit comments

Comments
 (0)