From 01a982741e304e925065300315354c33592797b0 Mon Sep 17 00:00:00 2001
From: Daniel <djeller@nettek.at>
Date: Mon, 13 May 2024 18:00:26 +0200
Subject: [PATCH 1/2] Fix another EDM model error for the OAI API

---
 my/XRX/src/mom/app/mom/xsl/cei2edm.xsl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl b/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl
index 1aa898c1..40f1a9fd 100644
--- a/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl
+++ b/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl
@@ -17,7 +17,9 @@
         <xsl:variable name="base" select="concat($base-image-url, .)" />
         <id base="{$base}" name="{substring-before(., '.')}">
           <xsl:if test="contains($base, 'images.monasterium.net')">
-            <xsl:attribute name="iiif" select="concat('http://images.icar-us.eu/iiif/2/', encode-for-uri(substring-after($base, 'images.monasterium.net/')), '/full/512,/0/default.jpg')" />
+            <xsl:variable name="iiif-base" select="concat('http://images.icar-us.eu/iiif/2/', encode-for-uri(substring-after($base, 'images.monasterium.net/')))" />
+            <xsl:attribute name="iiif-base" select="$iiif-base" />
+            <xsl:attribute name="iiif" select="concat($iiif-base, '/full/full/0/default.jpg')" />
           </xsl:if>
         </id>
       </xsl:for-each>
@@ -105,13 +107,13 @@
           <!-- Image webresource -->
           <edm:WebResource rdf:about="{if(exists(@iiif)) then @iiif else @base}">
             <!-- Image service -->
-            <xsl:if test="exists(@iiif)">
-              <svcs:has_service rdf:resource="{@iiif}" />
+            <xsl:if test="exists(@iiif-base)">
+              <svcs:has_service rdf:resource="{@iiif-base}" />
             </xsl:if>
           </edm:WebResource>
           <!-- Service for IIIF-->
-          <xsl:if test="exists(@iiif)">
-            <svcs:Service rdf:about="{@iiif}">
+          <xsl:if test="exists(@iiif-base)">
+            <svcs:Service rdf:about="{@iiif-base}">
               <dcterms:conformsTo rdf:resource="http://iiif.io/api/image" />
               <doap:implements rdf:resource="http://iiif.io/api/image/2/level2.json" />
             </svcs:Service>

From 12a1529af7dc8ced9e333d1c2c1d0da7f643e325 Mon Sep 17 00:00:00 2001
From: Daniel <djeller@nettek.at>
Date: Mon, 13 May 2024 18:41:29 +0200
Subject: [PATCH 2/2] Improve naming of OAI EDM image related XLST stuff

---
 my/XRX/src/mom/app/mom/xsl/cei2edm.xsl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl b/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl
index 40f1a9fd..93a14093 100644
--- a/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl
+++ b/my/XRX/src/mom/app/mom/xsl/cei2edm.xsl
@@ -14,12 +14,12 @@
     </xsl:variable>
     <xsl:variable name="image-ids">
       <xsl:for-each select="distinct-values(//cei:graphic/@url)">
-        <xsl:variable name="base" select="concat($base-image-url, .)" />
-        <id base="{$base}" name="{substring-before(., '.')}">
-          <xsl:if test="contains($base, 'images.monasterium.net')">
-            <xsl:variable name="iiif-base" select="concat('http://images.icar-us.eu/iiif/2/', encode-for-uri(substring-after($base, 'images.monasterium.net/')))" />
-            <xsl:attribute name="iiif-base" select="$iiif-base" />
-            <xsl:attribute name="iiif" select="concat($iiif-base, '/full/full/0/default.jpg')" />
+        <xsl:variable name="full-image-url" select="concat($base-image-url, .)" />
+        <id raw-image-url="{$full-image-url}" name="{substring-before(., '.')}">
+          <xsl:if test="contains($full-image-url, 'images.monasterium.net')">
+            <xsl:variable name="iiif-base-url" select="concat('http://images.icar-us.eu/iiif/2/', encode-for-uri(substring-after($full-image-url, 'images.monasterium.net/')))" />
+            <xsl:attribute name="iiif-json-url" select="$iiif-base-url" />
+            <xsl:attribute name="iiif-image-url" select="concat($iiif-base-url, '/full/full/0/default.jpg')" />
           </xsl:if>
         </id>
       </xsl:for-each>
@@ -90,10 +90,10 @@
             <xsl:sort select="@name" data-type="text" order="ascending" />
             <xsl:choose>
               <xsl:when test="position() = 1">
-                <edm:isShownBy rdf:resource="{if(exists(@iiif)) then @iiif else @base}" />
+                <edm:isShownBy rdf:resource="{if(exists(@iiif-image-url)) then @iiif-image-url else @raw-image-url}" />
               </xsl:when>
               <xsl:otherwise>
-                <edm:hasView rdf:resource="{if(exists(@iiif)) then @iiif else @base}" />
+                <edm:hasView rdf:resource="{if(exists(@iiif-image-url)) then @iiif-image-url else @raw-image-url}" />
               </xsl:otherwise>
             </xsl:choose>
           </xsl:for-each>
@@ -105,15 +105,15 @@
         <!-- Image related elements -->
         <xsl:for-each select="$image-ids/id">
           <!-- Image webresource -->
-          <edm:WebResource rdf:about="{if(exists(@iiif)) then @iiif else @base}">
+          <edm:WebResource rdf:about="{if(exists(@iiif-image-url)) then @iiif-image-url else @raw-image-url}">
             <!-- Image service -->
-            <xsl:if test="exists(@iiif-base)">
-              <svcs:has_service rdf:resource="{@iiif-base}" />
+            <xsl:if test="exists(@iiif-json-url)">
+              <svcs:has_service rdf:resource="{@iiif-json-url}" />
             </xsl:if>
           </edm:WebResource>
           <!-- Service for IIIF-->
-          <xsl:if test="exists(@iiif-base)">
-            <svcs:Service rdf:about="{@iiif-base}">
+          <xsl:if test="exists(@iiif-json-url)">
+            <svcs:Service rdf:about="{@iiif-json-url}">
               <dcterms:conformsTo rdf:resource="http://iiif.io/api/image" />
               <doap:implements rdf:resource="http://iiif.io/api/image/2/level2.json" />
             </svcs:Service>