From 3d1bef9d0e3fe820da9705427c129b5cb49d66fb Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 16:58:00 +0200
Subject: [PATCH 1/4] put DOIs in dc.identifier.doi

---
 dspace/config/spring/api/scopus-integration.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dspace/config/spring/api/scopus-integration.xml b/dspace/config/spring/api/scopus-integration.xml
index 47c5a4fbb900..6f7556574d09 100644
--- a/dspace/config/spring/api/scopus-integration.xml
+++ b/dspace/config/spring/api/scopus-integration.xml
@@ -128,7 +128,7 @@
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
     <bean id="scopus.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
+        <constructor-arg value="dc.identifier.doi"/>
     </bean>
 
     <bean id="scopusVolumeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
@@ -264,4 +264,4 @@
         <constructor-arg value="3"/>
     </bean>
 
-</beans>
\ No newline at end of file
+</beans>

From 2eff833fab361d4ed3c7b602b681823911f989af Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Tue, 9 Jul 2024 17:37:07 +0200
Subject: [PATCH 2/4] fix broken test

---
 .../dspace/app/rest/ScopusImportMetadataSourceServiceIT.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
index 7f6cb53ce400..e81f662ad5a9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
@@ -124,7 +124,7 @@ private ArrayList<ImportRecord> getRecords() {
         ArrayList<ImportRecord> records = new ArrayList<>();
         //define first record
         List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
-        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", null, "10.3934/mine.2023004");
+        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", "doi", "10.3934/mine.2023004");
         MetadatumDTO title = createMetadatumDTO("dc","title", null,
                 "Hardy potential versus lower order terms in Dirichlet problems: regularizing effects<sup>†</sup>");
         MetadatumDTO type = createMetadatumDTO("dc", "type", null, "Journal");
@@ -171,7 +171,7 @@ private ArrayList<ImportRecord> getRecords() {
 
         //define second record
         List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
-        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", null, "10.3934/mine.2023001");
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", "doi", "10.3934/mine.2023001");
         MetadatumDTO title2 = createMetadatumDTO("dc","title", null,
                 "Large deviations for a binary collision model: energy evaporation<sup>†</sup>");
         MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2023-01-01");

From 29067b6572b538650e4686e983edafcc355d87c5 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 17 Oct 2024 20:17:06 +0200
Subject: [PATCH 3/4] use dc.relation.hasversion for externally generated DOIs

---
 dspace/config/spring/api/scopus-integration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace/config/spring/api/scopus-integration.xml b/dspace/config/spring/api/scopus-integration.xml
index 6f7556574d09..d3e8150c74b1 100644
--- a/dspace/config/spring/api/scopus-integration.xml
+++ b/dspace/config/spring/api/scopus-integration.xml
@@ -128,7 +128,7 @@
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
     <bean id="scopus.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.doi"/>
+        <constructor-arg value="dc.relation.hasversion"/>
     </bean>
 
     <bean id="scopusVolumeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">

From d61dc8d911a4d226362d9a554226da5c304ad722 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 17 Oct 2024 20:19:04 +0200
Subject: [PATCH 4/4] use dc.relation.hasversion instead of dc.identifier.doi

---
 .../dspace/app/rest/ScopusImportMetadataSourceServiceIT.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
index e81f662ad5a9..f9164ddc5994 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScopusImportMetadataSourceServiceIT.java
@@ -124,7 +124,7 @@ private ArrayList<ImportRecord> getRecords() {
         ArrayList<ImportRecord> records = new ArrayList<>();
         //define first record
         List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
-        MetadatumDTO doi = createMetadatumDTO("dc", "identifier", "doi", "10.3934/mine.2023004");
+        MetadatumDTO doi = createMetadatumDTO("dc", "relation", "hasversion", "10.3934/mine.2023004");
         MetadatumDTO title = createMetadatumDTO("dc","title", null,
                 "Hardy potential versus lower order terms in Dirichlet problems: regularizing effects<sup>†</sup>");
         MetadatumDTO type = createMetadatumDTO("dc", "type", null, "Journal");
@@ -171,7 +171,7 @@ private ArrayList<ImportRecord> getRecords() {
 
         //define second record
         List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
-        MetadatumDTO doi2 = createMetadatumDTO("dc", "identifier", "doi", "10.3934/mine.2023001");
+        MetadatumDTO doi2 = createMetadatumDTO("dc", "relation", "hasversion", "10.3934/mine.2023001");
         MetadatumDTO title2 = createMetadatumDTO("dc","title", null,
                 "Large deviations for a binary collision model: energy evaporation<sup>†</sup>");
         MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2023-01-01");