From 77c8b79be9c031b11a5a1e318e4061ddc594739e Mon Sep 17 00:00:00 2001
From: Sebastian Hofmann <sebastian.hofmann@gbv.de>
Date: Wed, 7 Oct 2026 16:18:09 +0200
Subject: [PATCH 1/3] MIR-1686 Use REST API v2 instead of MCRFileNodeServlet in
 export formats

Link to files and derivates through the REST API v2 (contents and archive/zip)
instead of MCRFileNodeServlet and MCRZipServlet in the export formats oai_dc,
epicur, xMetaDissPlus and the Dissemin status. The link to
MCRZipServlet/{objectId} for objects with more than one derivate is unchanged.
---
 mir-module/src/main/resources/xslt/mods2epicur.xsl        | 8 ++++++--
 mir-module/src/main/resources/xslt/mods2oai_dc.xsl        | 6 ++++--
 mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl | 6 ++++--
 .../resources/xslt/sword/mycoreobject2dissemin-status.xsl | 6 ++++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mir-module/src/main/resources/xslt/mods2epicur.xsl b/mir-module/src/main/resources/xslt/mods2epicur.xsl
index 98294e1d2a..4cd36d6729 100644
--- a/mir-module/src/main/resources/xslt/mods2epicur.xsl
+++ b/mir-module/src/main/resources/xslt/mods2epicur.xsl
@@ -23,6 +23,8 @@
     </xsl:for-each>
   </xsl:variable>
 
+  <xsl:variable name="objectID" select="mycoreobject/@ID" />
+
   <xsl:template match="mycoreobject">
     <epicur xsi:schemaLocation="urn:nbn:de:1111-2004033116 http://www.persistent-identifier.de/xepicur/version1.0/xepicur.xsd" xmlns="urn:nbn:de:1111-2004033116"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -87,7 +89,8 @@
       <xsl:otherwise>
         <resource xmlns="urn:nbn:de:1111-2004033116">
           <identifier scheme="url" target="transfer">
-            <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',@id)" />
+            <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',$objectID,
+              '/derivates/',@id,'/archive/zip')" />
           </identifier>
           <format scheme="imt">
             <xsl:value-of select="'application/zip'" />
@@ -106,7 +109,8 @@
       </xsl:for-each>
       <xsl:value-of select="concat('/', encode-for-uri($ifsFileChild/name))" />
     </xsl:variable>
-    <xsl:value-of select="concat($ServletsBaseURL,'MCRFileNodeServlet/',$derId,$filePath)" />
+    <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',$objectID,
+      '/derivates/',$derId,'/contents',$filePath)" />
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/mods2oai_dc.xsl b/mir-module/src/main/resources/xslt/mods2oai_dc.xsl
index b454837f14..18ad62b2ef 100644
--- a/mir-module/src/main/resources/xslt/mods2oai_dc.xsl
+++ b/mir-module/src/main/resources/xslt/mods2oai_dc.xsl
@@ -50,12 +50,14 @@
                     <xsl:variable name="uri" select="$ifs/der/mcr_directory/children//child[@type='file']/uri" />
                     <xsl:variable name="derId" select="substring-before(substring-after($uri,':/'), ':')" />
                     <xsl:variable name="filePath" select="substring-after(substring-after($uri, ':'), ':')" />
-                    <xsl:value-of select="concat($ServletsBaseURL,'MCRFileNodeServlet/',$derId,$filePath)" />
+                    <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',$objId,
+                      '/derivates/',$derId,'/contents',$filePath)" />
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:choose>
                       <xsl:when test="$dernumber = 1">
-                        <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',$ifs/der/@id)" />
+                        <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',$objId,
+                          '/derivates/',$ifs/der/@id,'/archive/zip')" />
                       </xsl:when>
                       <xsl:otherwise>
                         <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',$objId)" />
diff --git a/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl b/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl
index 6b0b365339..dc9d637c0d 100644
--- a/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl
+++ b/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl
@@ -1102,12 +1102,14 @@
             <xsl:variable name="derId" select="substring-before(substring-after($uri,':/'), ':')" />
             <xsl:variable name="filePath" select="substring-after(substring-after($uri, ':'), ':')" />
             <!-- DNB requires ASCII-only URLs -->
-            <xsl:value-of select="concat($ServletsBaseURL,'MCRFileNodeServlet/', $derId, fn:iri-to-uri($filePath))" />
+            <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/', /mycoreobject/@ID,
+              '/derivates/', $derId, '/contents', fn:iri-to-uri($filePath))" />
           </xsl:when>
           <xsl:otherwise>
             <xsl:choose>
               <xsl:when test="$dernumber = 1">
-                <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',$ifs/der/@id)" />
+                <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',/mycoreobject/@ID,
+                  '/derivates/',$ifs/der/@id,'/archive/zip')" />
               </xsl:when>
               <xsl:otherwise>
                 <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',/mycoreobject/@ID)" />
diff --git a/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl b/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
index 1902f172cf..0806135333 100644
--- a/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
+++ b/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
@@ -50,9 +50,11 @@
                                   select="/mycoreobject/structure/derobjects/derobject[fn:contains(maindoc/text(), '.pdf')]"/>
                     <fn:string key="pdf_url">
                         <xsl:value-of select="concat($WebApplicationBaseURL,
-                        'servlets/MCRFileNodeServlet/',
+                        'api/v2/objects/',
+                        /mycoreobject/@ID,
+                        '/derivates/',
                         $derivate/@xlink:href,
-                        '/',
+                        '/contents/',
                         $derivate/maindoc/text())"/>
                     </fn:string>
                 </xsl:if>

From 883e7b36c1dd14bd6fcd29e6f84ffa235c42c949 Mon Sep 17 00:00:00 2001
From: Sebastian Hofmann <sebastian.hofmann@gbv.de>
Date: Mon, 19 Oct 2026 14:39:58 +0200
Subject: [PATCH 2/3] MIR-1686 Use REST API v2 instead of MCRFileNodeServlet in
 export formats link archives via contents.zip

---
 mir-module/src/main/resources/xslt/mods2epicur.xsl        | 2 +-
 mir-module/src/main/resources/xslt/mods2oai_dc.xsl        | 2 +-
 mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mir-module/src/main/resources/xslt/mods2epicur.xsl b/mir-module/src/main/resources/xslt/mods2epicur.xsl
index 4cd36d6729..1a94543ab4 100644
--- a/mir-module/src/main/resources/xslt/mods2epicur.xsl
+++ b/mir-module/src/main/resources/xslt/mods2epicur.xsl
@@ -90,7 +90,7 @@
         <resource xmlns="urn:nbn:de:1111-2004033116">
           <identifier scheme="url" target="transfer">
             <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',$objectID,
-              '/derivates/',@id,'/archive/zip')" />
+              '/derivates/',@id,'/contents.zip')" />
           </identifier>
           <format scheme="imt">
             <xsl:value-of select="'application/zip'" />
diff --git a/mir-module/src/main/resources/xslt/mods2oai_dc.xsl b/mir-module/src/main/resources/xslt/mods2oai_dc.xsl
index 18ad62b2ef..3531f839d2 100644
--- a/mir-module/src/main/resources/xslt/mods2oai_dc.xsl
+++ b/mir-module/src/main/resources/xslt/mods2oai_dc.xsl
@@ -57,7 +57,7 @@
                     <xsl:choose>
                       <xsl:when test="$dernumber = 1">
                         <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',$objId,
-                          '/derivates/',$ifs/der/@id,'/archive/zip')" />
+                          '/derivates/',$ifs/der/@id,'/contents.zip')" />
                       </xsl:when>
                       <xsl:otherwise>
                         <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',$objId)" />
diff --git a/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl b/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl
index dc9d637c0d..b34acd2c4b 100644
--- a/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl
+++ b/mir-module/src/main/resources/xslt/mods2xMetaDissPlus.xsl
@@ -1109,7 +1109,7 @@
             <xsl:choose>
               <xsl:when test="$dernumber = 1">
                 <xsl:value-of select="concat($WebApplicationBaseURL,'api/v2/objects/',/mycoreobject/@ID,
-                  '/derivates/',$ifs/der/@id,'/archive/zip')" />
+                  '/derivates/',$ifs/der/@id,'/contents.zip')" />
               </xsl:when>
               <xsl:otherwise>
                 <xsl:value-of select="concat($ServletsBaseURL,'MCRZipServlet/',/mycoreobject/@ID)" />

From e0ac88b8f21a486b34cf349ab22dca5ece67f7c1 Mon Sep 17 00:00:00 2001
From: Sebastian Hofmann <sebastian.hofmann@gbv.de>
Date: Mon, 26 Oct 2026 15:51:22 +0100
Subject: [PATCH 3/3] MIR-1686 Use REST API v2 instead of MCRFileNodeServlet in
 export formats fix cardinality and encode maindoc in dissemin status

---
 .../resources/xslt/sword/mycoreobject2dissemin-status.xsl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl b/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
index 0806135333..516fc67210 100644
--- a/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
+++ b/mir-module/src/main/resources/xslt/sword/mycoreobject2dissemin-status.xsl
@@ -45,9 +45,9 @@
                         </fn:string>
                     </xsl:when>
                 </xsl:choose>
-                <xsl:if test="count(/mycoreobject/structure/derobjects/derobject[fn:contains(maindoc/text(), '.pdf')])&gt;0">
-                    <xsl:variable name="derivate"
-                                  select="/mycoreobject/structure/derobjects/derobject[fn:contains(maindoc/text(), '.pdf')]"/>
+                <xsl:variable name="derivate"
+                              select="(/mycoreobject/structure/derobjects/derobject[fn:contains(maindoc/text(), '.pdf')])[1]"/>
+                <xsl:if test="$derivate">
                     <fn:string key="pdf_url">
                         <xsl:value-of select="concat($WebApplicationBaseURL,
                         'api/v2/objects/',
@@ -55,7 +55,7 @@
                         '/derivates/',
                         $derivate/@xlink:href,
                         '/contents/',
-                        $derivate/maindoc/text())"/>
+                        fn:string-join(fn:tokenize($derivate/maindoc/text(), '/') ! fn:encode-for-uri(.), '/'))"/>
                     </fn:string>
                 </xsl:if>
             </fn:map>