From ac418330224d807af731bb53e10fb81ab1d69ae3 Mon Sep 17 00:00:00 2001
From: Ondra Kosarko <okosarko@dspace-dev.ufal.mff.cuni.cz>
Date: Fri, 29 Sep 2023 15:02:58 +0200
Subject: [PATCH] support for dois and preregister pids

---
 .../identifier/doi/DataCiteConnector.java     |  3 +-
 dspace/config/crosswalks/DIM2DataCite.xsl     | 49 +++++--------------
 dspace/config/item-submission.xml             |  3 +-
 .../config/spring/api/identifier-service.xml  |  6 +--
 dspace/config/spring/api/item-filters.xml     | 13 +++++
 5 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
index 57136d6143bb..e20bf085afa9 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
@@ -438,10 +438,11 @@ public void reserveDOI(Context context, DSpaceObject dso, String doi)
                 return;
             }
             // 400 -> invalid XML
+	    case (422):
             case (400): {
                 log.warn("DataCite was unable to understand the XML we send.");
                 log.warn("DataCite Metadata API returned a http status code "
-                             + "400: " + resp.getContent());
+                             + resp.getStatusCode() + ": " + resp.getContent());
                 Format format = Format.getCompactFormat();
                 format.setEncoding("UTF-8");
                 XMLOutputter xout = new XMLOutputter(format);
diff --git a/dspace/config/crosswalks/DIM2DataCite.xsl b/dspace/config/crosswalks/DIM2DataCite.xsl
index e92c371d6a77..867216484aa0 100644
--- a/dspace/config/crosswalks/DIM2DataCite.xsl
+++ b/dspace/config/crosswalks/DIM2DataCite.xsl
@@ -11,7 +11,7 @@
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dspace="http://www.dspace.org/xmlns/dspace/dim"
-                xmlns="http://datacite.org/schema/kernel-3"
+		xmlns="http://datacite.org/schema/kernel-4"
                 version="2.0">
     
     <!-- CONFIGURATION -->
@@ -46,9 +46,9 @@
             properties are in the metadata of the item to export.
             The classe named above respects this.
         -->
-        <resource xmlns="http://datacite.org/schema/kernel-3"
+        <resource xmlns="http://datacite.org/schema/kernel-4"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd">
+		  xsi:schemaLocation="http://datacite.org/schema/kernel-4 https://schema.datacite.org/meta/kernel-4.4/metadata.xsd">
 
             <!--
                 MANDATORY PROPERTIES
@@ -139,6 +139,13 @@
                 </xsl:choose>
             </publicationYear>
 
+            <!--
+                DataCite (10)
+                Template call for ResourceType
+                DataCite allows the ResourceType to ouccre not more than once.
+            -->
+            <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />
+
             <!--
                 OPTIONAL PROPERTIES
             -->
@@ -214,13 +221,6 @@
             -->
             <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='language' and (@qualifier='iso' or @qualifier='rfc3066')])[1]" />
 
-            <!--
-                DataCite (10)
-                Template call for ResourceType
-                DataCite allows the ResourceType to ouccre not more than once.
-            -->
-            <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />
-
             <!-- 
                 DataCite (11)
                 Add alternativeIdentifiers.
@@ -469,35 +469,12 @@
         Adds resourceType and resourceTypeGeneral information
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='type'][1]">
+	<xsl:variable name="types" select="tokenize(text(),';')"/>
         <xsl:element name="resourceType">
             <xsl:attribute name="resourceTypeGeneral">
-                <xsl:choose>
-                    <xsl:when test="string(text())='Animation'">Audiovisual</xsl:when>
-                    <xsl:when test="string(text())='Article'">Text</xsl:when>
-                    <xsl:when test="string(text())='Book'">Text</xsl:when>
-                    <xsl:when test="string(text())='Book chapter'">Text</xsl:when>
-                    <xsl:when test="string(text())='Dataset'">Dataset</xsl:when>
-                    <xsl:when test="string(text())='Learning Object'">InteractiveResource</xsl:when>
-                    <xsl:when test="string(text())='Image'">Image</xsl:when>
-                    <xsl:when test="string(text())='Image, 3-D'">Image</xsl:when>
-                    <xsl:when test="string(text())='Map'">Model</xsl:when>
-                    <xsl:when test="string(text())='Musical Score'">Other</xsl:when>
-                    <xsl:when test="string(text())='Plan or blueprint'">Model</xsl:when>
-                    <xsl:when test="string(text())='Preprint'">Text</xsl:when>
-                    <xsl:when test="string(text())='Presentation'">Text</xsl:when>
-                    <xsl:when test="string(text())='Recording, acoustical'">Sound</xsl:when>
-                    <xsl:when test="string(text())='Recording, musical'">Sound</xsl:when>
-                    <xsl:when test="string(text())='Recording, oral'">Sound</xsl:when>
-                    <xsl:when test="string(text())='Software'">Software</xsl:when>
-                    <xsl:when test="string(text())='Technical Report'">Text</xsl:when>
-                    <xsl:when test="string(text())='Thesis'">Text</xsl:when>
-                    <xsl:when test="string(text())='Video'">Audiovisual</xsl:when>
-                    <xsl:when test="string(text())='Working Paper'">Text</xsl:when>
-                    <xsl:when test="string(text())='Other'">Other</xsl:when>
-                    <xsl:otherwise>Other</xsl:otherwise>
-                </xsl:choose>
+		    <xsl:value-of select="$types[1]"/>
             </xsl:attribute>
-            <xsl:value-of select="." />
+            <xsl:value-of select="$types[2]" />
         </xsl:element>
     </xsl:template>
 
diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index c38e59a53302..50a36e7970e6 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -258,7 +258,7 @@
             <step id="collection"/>
             <!-- To include the 'Show Identifiers' step, uncomment the line below. Make sure
                  that identifiers.cfg and identifier-service.xml are properly configured. -->
-            <!--<step id="identifiers"/>-->
+            <step id="identifiers"/><!---->
             <!--Step will be to Describe the item. -->
             <step id="traditionalpageone"/>
             <step id="traditionalpagetwo"/>
@@ -284,6 +284,7 @@
 
         <submission-process name="datacite">
             <step id="collection"></step>
+            <step id="identifiers"/><!---->
             <step id="datacitemandatory"></step>
             <step id="upload"/>
             <step id="license"/>
diff --git a/dspace/config/spring/api/identifier-service.xml b/dspace/config/spring/api/identifier-service.xml
index dbcd49df0e92..a1dfdaa7c215 100644
--- a/dspace/config/spring/api/identifier-service.xml
+++ b/dspace/config/spring/api/identifier-service.xml
@@ -48,6 +48,7 @@
          depending on whether you have Item Level Versioning activated or not.
     -->
     <!--
+    -->
     <bean id="org.dspace.identifier.DOIIdentifierProvider"
         class="org.dspace.identifier.DOIIdentifierProvider"
         scope="singleton">
@@ -55,9 +56,8 @@
             ref="org.dspace.services.ConfigurationService" />
         <property name="DOIConnector"
             ref="org.dspace.identifier.doi.DOIConnector" />
-        <property name="filter" ref="doi-filter" />
+	    <!--<property name="filter" ref="doi-filter" />-->
     </bean>
-    -->
     <!--
     <bean id="org.dspace.identifier.DOIIdentifierProvider"
         class="org.dspace.identifier.VersionedDOIIdentifierProvider"
@@ -93,6 +93,7 @@
          DataCiteConnector won't work if EZID is your registration agency.
     -->
     <!-- Uncomment this to use the DataCite API directly as DOIConnector.
+    -->
     <bean id="org.dspace.identifier.doi.DOIConnector"
         class="org.dspace.identifier.doi.DataCiteConnector"
         scope="singleton">
@@ -102,7 +103,6 @@
         <property name='DATACITE_METADATA_PATH' value='/metadata/' />
         <property name='disseminationCrosswalkName' value="DataCite" />
     </bean>
-    -->
 
     <!-- Provider to mint and register DOIs using EZID as the registrar.
     -->
diff --git a/dspace/config/spring/api/item-filters.xml b/dspace/config/spring/api/item-filters.xml
index 24c463fb531e..e528603fb9eb 100644
--- a/dspace/config/spring/api/item-filters.xml
+++ b/dspace/config/spring/api/item-filters.xml
@@ -218,6 +218,19 @@
                         </bean>
                         <!-- Create DOIs for items only that do have at least one bitstream. -->
                         <ref bean="has-at-least-one-bitstream_condition"/>
+			<!--
+			<bean class="org.dspace.content.logic.condition.InCollectionCondition">
+				<property name="parameters">
+					<map>
+						<entry key="collections">
+							<list>
+								<value>123456789/4</value>
+							</list>
+						</entry>
+					</map>
+				</property>
+			</bean>
+			-->
                     </list>
                 </property>
             </bean>