From 03ca0919d49290bc0c92cc642f4f8f1987989cc7 Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Tue, 12 Nov 2024 12:58:14 +0100
Subject: [PATCH 1/3] MIR-1409 Added stylesheet response-mir-hit-oa.xsl to
 enable application modules overwriting of (open) access icon

---
 .../resources/xsl/response-mir-hit-oa.xsl     | 31 +++++++++++++++++++
 .../src/main/resources/xsl/response-mir.xsl   | 23 ++------------
 2 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 mir-module/src/main/resources/xsl/response-mir-hit-oa.xsl

diff --git a/mir-module/src/main/resources/xsl/response-mir-hit-oa.xsl b/mir-module/src/main/resources/xsl/response-mir-hit-oa.xsl
new file mode 100644
index 0000000000..a9bb6c546b
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/response-mir-hit-oa.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
+                exclude-result-prefixes="i18n xsl">
+
+  <xsl:template name="hit-oa">
+    <div class="hit_oa" data-toggle="tooltip">
+      <xsl:variable name="isOpenAccess" select="bool[@name='worldReadableComplete']='true'"/>
+
+      <xsl:choose>
+        <xsl:when test="$isOpenAccess">
+          <xsl:attribute name="title">
+            <xsl:value-of select="i18n:translate('mir.response.openAccess.true')"/>
+          </xsl:attribute>
+          <span class="badge badge-success">
+            <i class="fas fa-unlock-alt" aria-hidden="true"/>
+          </span>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:attribute name="title">
+            <xsl:value-of select="i18n:translate('mir.response.openAccess.false')"/>
+          </xsl:attribute>
+          <span class="badge badge-warning">
+            <i class="fas fa-lock" aria-hidden="true"/>
+          </span>
+        </xsl:otherwise>
+      </xsl:choose>
+    </div>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
index f8f6b32d84..cf4b44060d 100644
--- a/mir-module/src/main/resources/xsl/response-mir.xsl
+++ b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -15,6 +15,7 @@
 
   <xsl:include href="resource:xsl/csl-export-gui.xsl" />
   <xsl:include href="resource:xsl/response-facets.xsl"/>
+  <xsl:include href="resource:xsl/response-mir-hit-oa.xsl" />
   <xsl:include href="resource:xsl/response-mir-utils.xsl" />
 
   <xsl:param name="UserAgent" />
@@ -541,27 +542,7 @@
 <!-- hit type -->
           <div class="hit_tnd_container">
             <div class="hit_tnd_content">
-              <div class="hit_oa" data-toggle="tooltip">
-                <xsl:variable name="isOpenAccess" select="bool[@name='worldReadableComplete']='true'" />
-                <xsl:choose>
-                  <xsl:when test="$isOpenAccess">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="i18n:translate('mir.response.openAccess.true')" />
-                    </xsl:attribute>
-                    <span class="badge badge-success">
-                      <i class="fas fa-unlock-alt" aria-hidden="true"></i>
-                    </span>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="i18n:translate('mir.response.openAccess.false')" />
-                    </xsl:attribute>
-                    <span class="badge badge-warning">
-                      <i class="fas fa-lock" aria-hidden="true"></i>
-                    </span>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </div>
+              <xsl:call-template name="hit-oa"/>
               <xsl:choose>
                 <xsl:when test="arr[@name='mods.genre']">
                   <xsl:for-each select="arr[@name='mods.genre']/str">

From 551413c47d45015691caed834952378941ea859f Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Mon, 25 Nov 2024 11:00:34 +0100
Subject: [PATCH 2/3] MIR-1409 Added separate stylesheets for badges and
 xslInclude:solrResponseBadges to response-mir.xsl

---
 .../resources/config/mir/mycore.properties    |  1 +
 .../resources/xsl/response-mir-hit-date.xsl   | 25 ++++++
 .../xsl/response-mir-hit-licence.xsl          | 31 ++++++++
 .../resources/xsl/response-mir-hit-state.xsl  | 24 ++++++
 .../resources/xsl/response-mir-hit-type.xsl   | 28 +++++++
 .../src/main/resources/xsl/response-mir.xsl   | 79 +++----------------
 6 files changed, 119 insertions(+), 69 deletions(-)
 create mode 100644 mir-module/src/main/resources/xsl/response-mir-hit-date.xsl
 create mode 100644 mir-module/src/main/resources/xsl/response-mir-hit-licence.xsl
 create mode 100644 mir-module/src/main/resources/xsl/response-mir-hit-state.xsl
 create mode 100644 mir-module/src/main/resources/xsl/response-mir-hit-type.xsl

diff --git a/mir-module/src/main/resources/config/mir/mycore.properties b/mir-module/src/main/resources/config/mir/mycore.properties
index 426471b67b..15b5edba97 100644
--- a/mir-module/src/main/resources/config/mir/mycore.properties
+++ b/mir-module/src/main/resources/config/mir/mycore.properties
@@ -278,6 +278,7 @@ MCR.URIResolver.xslIncludes.mods=%MCR.URIResolver.xslIncludes.mods%,mods2mods-cl
 MCR.URIResolver.xslIncludes.mycoreobjectXML=%MCR.URIResolver.xslIncludes.mycoreobjectXML%,embargofilter.xsl
 MCR.URIResolver.xslIncludes.RDF-mods-journal=%MCR.URIResolver.xslIncludes.RDF-mods-journal%,RDF-mods-journal-mir.xsl
 MCR.URIResolver.xslIncludes.solrResponse=%MCR.URIResolver.xslIncludes.solrResponse%,response-mir.xsl
+MCR.URIResolver.xslIncludes.solrResponseBadges=response-mir-hit-oa.xsl,response-mir-hit-type.xsl,response-mir-hit-licence.xsl,response-mir-hit-date.xsl,response-mir-hit-state.xsl
 MCR.URIResolver.xslIncludes.xeditorTemplates=%MCR.URIResolver.xslIncludes.xeditorTemplates%,xeditor-mir-templates.xsl
 MIR.AVPlayer.Stylesheet=metadata/mir-video.js.xsl
 MCR.URIResolver.xslImports.modsmeta=metadata/mods-metadata-base.xsl,metadata/mir-browse.xsl,metadata/mir-breadcrumbs.xsl,metadata/mir-metadata-box.xsl,metadata/mir-admindata-box.xsl,metadata/mir-abstract.xsl,metadata/mir-collapse-files.xsl,metadata/mir-file-upload.xsl,metadata/mir-edit.xsl,metadata/mir-share.xsl,%MIR.AVPlayer.Stylesheet%,metadata/mir-viewer.xsl,metadata/mir-citation.xsl,metadata/mir-thumbnail.xsl,metadata/mir-export.xsl,metadata/mir-history.xsl,metadata/mir-epusta.xsl,metadata/mir-workflow.xsl
diff --git a/mir-module/src/main/resources/xsl/response-mir-hit-date.xsl b/mir-module/src/main/resources/xsl/response-mir-hit-date.xsl
new file mode 100644
index 0000000000..7d3df5294d
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/response-mir-hit-date.xsl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                exclude-result-prefixes="xsl">
+
+  <xsl:template name="hit-date">
+    <xsl:if test="str[@name='mods.dateIssued'] or str[@name='mods.dateIssued.host']">
+      <div class="hit_date">
+        <xsl:variable name="date">
+          <xsl:choose>
+            <xsl:when test="str[@name='mods.dateIssued']">
+              <xsl:value-of select="str[@name='mods.dateIssued']"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="str[@name='mods.dateIssued.host']"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:variable>
+        <span class="badge badge-primary">
+          <xsl:value-of select="$date"/>
+        </span>
+      </div>
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir-hit-licence.xsl b/mir-module/src/main/resources/xsl/response-mir-hit-licence.xsl
new file mode 100644
index 0000000000..6a02cf2449
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/response-mir-hit-licence.xsl
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
+                xmlns:mcrxsl="xalan://org.mycore.common.xml.MCRXMLFunctions"
+                exclude-result-prefixes="i18n mcrxsl xsl">
+
+  <xsl:template name="hit-licence">
+    <xsl:if test="arr[@name='category.top']/str[contains(text(), 'mir_licenses:')]">
+      <div class="hit_license">
+        <span class="badge badge-primary">
+          <xsl:variable name="accessCondition">
+            <xsl:value-of
+              select="substring-after(arr[@name='category.top']/str[contains(text(), 'mir_licenses:')][last()],':')"/>
+          </xsl:variable>
+          <xsl:choose>
+            <xsl:when test="contains($accessCondition, 'rights_reserved')">
+              <xsl:value-of select="i18n:translate('component.mods.metaData.dictionary.rightsReserved')"/>
+            </xsl:when>
+            <xsl:when test="contains($accessCondition, 'oa_nlz')">
+              <xsl:value-of select="i18n:translate('component.mods.metaData.dictionary.oa_nlz.short')"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="mcrxsl:getDisplayName('mir_licenses',$accessCondition)"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </span>
+      </div>
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir-hit-state.xsl b/mir-module/src/main/resources/xsl/response-mir-hit-state.xsl
new file mode 100644
index 0000000000..e9e822b6d6
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/response-mir-hit-state.xsl
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation"
+                xmlns:mcrxsl="xalan://org.mycore.common.xml.MCRXMLFunctions"
+                exclude-result-prefixes="i18n mcrxsl xsl">
+
+  <xsl:template name="hit-state">
+    <xsl:if test="not (mcrxsl:isCurrentUserGuestUser())">
+      <div class="hit_state">
+        <xsl:variable name="status-i18n">
+          <!-- template in mir-utils.xsl -->
+          <xsl:call-template name="get-doc-state-label">
+            <xsl:with-param name="state-categ-id" select="str[@name='state']"/>
+          </xsl:call-template>
+        </xsl:variable>
+        <span class="badge mir-{str[@name='state']}"
+              title="{i18n:translate('component.mods.metaData.dictionary.status')}">
+          <xsl:value-of select="$status-i18n"/>
+        </span>
+      </div>
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir-hit-type.xsl b/mir-module/src/main/resources/xsl/response-mir-hit-type.xsl
new file mode 100644
index 0000000000..2cbf895a32
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/response-mir-hit-type.xsl
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:mcrxsl="xalan://org.mycore.common.xml.MCRXMLFunctions"
+                exclude-result-prefixes="mcrxsl xsl">
+
+  <xsl:template name="hit-type">
+    <xsl:choose>
+      <xsl:when test="arr[@name='mods.genre']">
+        <xsl:for-each select="arr[@name='mods.genre']/str">
+          <div class="hit_type">
+            <span class="badge badge-info">
+              <xsl:value-of select="mcrxsl:getDisplayName('mir_genres',.)"/>
+            </span>
+          </div>
+        </xsl:for-each>
+      </xsl:when>
+      <xsl:otherwise>
+        <div class="hit_type">
+          <span class="badge badge-info">
+            <xsl:value-of select="mcrxsl:getDisplayName('mir_genres','article')"/>
+          </span>
+        </div>
+      </xsl:otherwise>
+    </xsl:choose>
+
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
index cf4b44060d..4d64dcea4e 100644
--- a/mir-module/src/main/resources/xsl/response-mir.xsl
+++ b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -15,7 +15,7 @@
 
   <xsl:include href="resource:xsl/csl-export-gui.xsl" />
   <xsl:include href="resource:xsl/response-facets.xsl"/>
-  <xsl:include href="resource:xsl/response-mir-hit-oa.xsl" />
+  <xsl:include href="xslInclude:solrResponseBadges"/>
   <xsl:include href="resource:xsl/response-mir-utils.xsl" />
 
   <xsl:param name="UserAgent" />
@@ -543,74 +543,15 @@
           <div class="hit_tnd_container">
             <div class="hit_tnd_content">
               <xsl:call-template name="hit-oa"/>
-              <xsl:choose>
-                <xsl:when test="arr[@name='mods.genre']">
-                  <xsl:for-each select="arr[@name='mods.genre']/str">
-                    <div class="hit_type">
-                      <span class="badge badge-info">
-                        <xsl:value-of select="mcrxsl:getDisplayName('mir_genres',.)" ></xsl:value-of>
-                      </span>
-                    </div>
-                  </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                  <div class="hit_type">
-                    <span class="badge badge-info">
-                      <xsl:value-of select="mcrxsl:getDisplayName('mir_genres','article')" />
-                    </span>
-                  </div>
-                </xsl:otherwise>
-              </xsl:choose>
-              <xsl:if test="arr[@name='category.top']/str[contains(text(), 'mir_licenses:')]">
-                <div class="hit_license">
-                  <span class="badge badge-primary">
-                    <xsl:variable name="accessCondition">
-                      <xsl:value-of select="substring-after(arr[@name='category.top']/str[contains(text(), 'mir_licenses:')][last()],':')" />
-                    </xsl:variable>
-                    <xsl:choose>
-                      <xsl:when test="contains($accessCondition, 'rights_reserved')">
-                        <xsl:value-of select="i18n:translate('component.mods.metaData.dictionary.rightsReserved')" />
-                      </xsl:when>
-                      <xsl:when test="contains($accessCondition, 'oa_nlz')">
-                        <xsl:value-of select="i18n:translate('component.mods.metaData.dictionary.oa_nlz.short')" />
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="mcrxsl:getDisplayName('mir_licenses',$accessCondition)" />
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </span>
-                </div>
-              </xsl:if>
-              <xsl:if test="str[@name='mods.dateIssued'] or str[@name='mods.dateIssued.host']">
-                <div class="hit_date">
-                  <xsl:variable name="date">
-                    <xsl:choose>
-                      <xsl:when test="str[@name='mods.dateIssued']">
-                        <xsl:value-of select="str[@name='mods.dateIssued']" />
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="str[@name='mods.dateIssued.host']" />
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:variable>
-                  <span class="badge badge-primary">
-                    <xsl:value-of select="$date" />
-                  </span>
-                </div>
-              </xsl:if>
-              <xsl:if test="not (mcrxsl:isCurrentUserGuestUser())">
-                <div class="hit_state">
-                  <xsl:variable name="status-i18n">
-                    <!-- template in mir-utils.xsl -->
-                    <xsl:call-template name="get-doc-state-label">
-                      <xsl:with-param name="state-categ-id" select="str[@name='state']"/>
-                    </xsl:call-template>
-                  </xsl:variable>
-                  <span class="badge mir-{str[@name='state']}" title="{i18n:translate('component.mods.metaData.dictionary.status')}">
-                    <xsl:value-of select="$status-i18n" />
-                  </span>
-                </div>
-              </xsl:if>
+
+              <xsl:call-template name="hit-type"/>
+
+              <xsl:call-template name="hit-licence"/>
+
+              <xsl:call-template name="hit-date"/>
+
+              <xsl:call-template name="hit-state"/>
+
               <xsl:if test="string-length($MCR.ORCID.OAuth.ClientSecret) &gt; 0">
                 <div class="orcid-status" data-id="{$identifier}" />
               </xsl:if>

From 49181f60ddd157c440c86676726fbb8cbaa9d60b Mon Sep 17 00:00:00 2001
From: Silvio Hermann <s.hermann@uni-jena.de>
Date: Mon, 2 Dec 2024 14:16:16 +0100
Subject: [PATCH 3/3] MIR-1409 Introduced extra xsl file wrapping the calls to
 the badge generating templates

---
 .../resources/xsl/response-mir-hit-badges.xsl     | 15 +++++++++++++++
 .../src/main/resources/xsl/response-mir.xsl       | 12 ++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 mir-module/src/main/resources/xsl/response-mir-hit-badges.xsl

diff --git a/mir-module/src/main/resources/xsl/response-mir-hit-badges.xsl b/mir-module/src/main/resources/xsl/response-mir-hit-badges.xsl
new file mode 100644
index 0000000000..53e02d9617
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/response-mir-hit-badges.xsl
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                exclude-result-prefixes="xsl">
+
+  <xsl:include href="xslInclude:solrResponseBadges"/>
+
+  <xsl:template name="mir-hit-badges">
+    <xsl:call-template name="hit-oa"/>
+    <xsl:call-template name="hit-type"/>
+    <xsl:call-template name="hit-licence"/>
+    <xsl:call-template name="hit-date"/>
+    <xsl:call-template name="hit-state"/>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/response-mir.xsl b/mir-module/src/main/resources/xsl/response-mir.xsl
index 4d64dcea4e..d84ab72c50 100644
--- a/mir-module/src/main/resources/xsl/response-mir.xsl
+++ b/mir-module/src/main/resources/xsl/response-mir.xsl
@@ -15,7 +15,7 @@
 
   <xsl:include href="resource:xsl/csl-export-gui.xsl" />
   <xsl:include href="resource:xsl/response-facets.xsl"/>
-  <xsl:include href="xslInclude:solrResponseBadges"/>
+  <xsl:include href="resource:xsl/response-mir-hit-badges.xsl"/>
   <xsl:include href="resource:xsl/response-mir-utils.xsl" />
 
   <xsl:param name="UserAgent" />
@@ -542,15 +542,7 @@
 <!-- hit type -->
           <div class="hit_tnd_container">
             <div class="hit_tnd_content">
-              <xsl:call-template name="hit-oa"/>
-
-              <xsl:call-template name="hit-type"/>
-
-              <xsl:call-template name="hit-licence"/>
-
-              <xsl:call-template name="hit-date"/>
-
-              <xsl:call-template name="hit-state"/>
+              <xsl:call-template name="mir-hit-badges"/>
 
               <xsl:if test="string-length($MCR.ORCID.OAuth.ClientSecret) &gt; 0">
                 <div class="orcid-status" data-id="{$identifier}" />