From e4dba5e4c4a687d74235808c73c514fdda99d02e Mon Sep 17 00:00:00 2001
From: Antoniafriedrich <antonia.friedrich@uni-jena.de>
Date: Fri, 13 Dec 2024 11:14:13 +0100
Subject: [PATCH] Refactores printnames template to reduce redundancy

---
 .../src/main/resources/xsl/e-mail-events.xsl  | 29 ++-----
 .../resources/xsl/import/helperTemplates.xsl  | 28 +++++++
 .../resources/xsl/metadata/mods-metadata.xsl  | 77 +++++++------------
 .../src/main/resources/xsl/mods2csv.xsl       | 40 ++++------
 4 files changed, 73 insertions(+), 101 deletions(-)
 create mode 100644 mir-module/src/main/resources/xsl/import/helperTemplates.xsl

diff --git a/mir-module/src/main/resources/xsl/e-mail-events.xsl b/mir-module/src/main/resources/xsl/e-mail-events.xsl
index 53bb3a9870..bc21608d8a 100644
--- a/mir-module/src/main/resources/xsl/e-mail-events.xsl
+++ b/mir-module/src/main/resources/xsl/e-mail-events.xsl
@@ -14,7 +14,7 @@
   <xsl:variable name="newline" select="'&#xA;'" />
   <xsl:variable name="categories" select="document('classification:metadata:1:children:mir_institutes')/mycoreclass/categories" />
   <xsl:variable name="institutemember" select="$categories/category[mcrxsl:isCurrentUserInRole(concat('mir_institutes:',@ID))]" />
-
+  <xsl:include href="import/helperTemplates.xsl" />
   <xsl:template match="/">
     <xsl:message>
       type:
@@ -121,7 +121,9 @@
           <xsl:if test="position()!=1">
             <xsl:value-of select="', '" />
           </xsl:if>
-          <xsl:apply-templates select="." mode="printName" />
+          <xsl:call-template name="printAuthorName">
+            <xsl:with-param name="node" select="mods:name" />
+          </xsl:call-template>
         </xsl:for-each>
       </xsl:variable>
       <xsl:value-of select="concat('Autor(en)       : ',$authors,$newline)" />
@@ -231,26 +233,5 @@
     <xsl:value-of select="concat(' (',@valueURI,')')" />
   </xsl:template>
 
-<!-- Names -->
-  <xsl:template match="mods:name" mode="printName">
-    <xsl:choose>
-      <xsl:when test="mods:namePart">
-        <xsl:choose>
-          <xsl:when test="mods:namePart[@type='given'] and mods:namePart[@type='family']">
-            <xsl:value-of select="concat(mods:namePart[@type='family'], ', ',mods:namePart[@type='given'])" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="mods:namePart" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="mods:displayForm">
-        <xsl:value-of select="mods:displayForm" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="." />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/import/helperTemplates.xsl b/mir-module/src/main/resources/xsl/import/helperTemplates.xsl
new file mode 100644
index 0000000000..7324f31caa
--- /dev/null
+++ b/mir-module/src/main/resources/xsl/import/helperTemplates.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:mods="http://www.loc.gov/mods/v3"
+                exclude-result-prefixes="mods">
+    <!-- Names -->
+    <xsl:template name="printAuthorName">
+        <xsl:param name="node" />
+        <xsl:choose>
+            <xsl:when test="$node/mods:namePart">
+                <xsl:choose>
+                    <xsl:when test="$node/mods:namePart[@type='given'] and $node/mods:namePart[@type='family']">
+                        <xsl:value-of select="concat($node/mods:namePart[@type='family'], ', ', $node/mods:namePart[@type='given'])" />
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="$node/mods:namePart" />
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:when>
+            <xsl:when test="$node/mods:displayForm">
+                <xsl:value-of select="$node/mods:displayForm" />
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$node" />
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+</xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/metadata/mods-metadata.xsl b/mir-module/src/main/resources/xsl/metadata/mods-metadata.xsl
index bfdd11b224..0ea1653a56 100644
--- a/mir-module/src/main/resources/xsl/metadata/mods-metadata.xsl
+++ b/mir-module/src/main/resources/xsl/metadata/mods-metadata.xsl
@@ -11,6 +11,7 @@
 
   <xsl:import href="xslImport:modsmeta" />
   <xsl:include href="layout/mir-layout-utils.xsl" />
+  <xsl:include href="import/helperTemplates.xsl" />
   <xsl:include href="mods-utils.xsl" />
   <xsl:include href="mir-mods-utils.xsl" />
   <xsl:key use="@id" name="rights" match="/mycoreobject/rights/right" />
@@ -78,36 +79,33 @@
     </site>
   </xsl:template>
 
-  <xsl:template name="printMirMessage">
-    <xsl:param name="title" />
-    <xsl:param name="msg" />
-    <div id="mir-message">
-      <div class="jumbotron">
-        <h1>
-          <xsl:value-of select="$title" />
-        </h1>
-        <xsl:if test="$msg">
-          <p>
-            <xsl:copy-of select="$msg" />
-          </p>
-            <xsl:if test="$MIR.Blocked.Detailpage='true'">
-                <xsl:call-template name="renderMetadata">
+    <xsl:template name="printMirMessage">
+        <xsl:param name="title" />
+        <xsl:param name="msg" />
+        <div id="mir-message">
+            <div class="jumbotron">
+                <h1>
+                    <xsl:value-of select="$title" />
+                </h1>
+                <xsl:if test="$msg">
+                    <p>
+                        <xsl:copy-of select="$msg" />
+                    </p>
+                </xsl:if>
+                <xsl:if test="$MIR.Blocked.Detailpage = 'true'">
+                    <xsl:call-template name="renderMetadata">
                     <xsl:with-param name="mods"
                                     select="mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods"/>
-                    <xsl:with-param name="doiResolver" select="$MCR.DOI.Resolver.MasterURL"/>
-                    <xsl:with-param name="urnResolver" select="$MCR.URN.Resolver.MasterURL"/>
-                </xsl:call-template>
-                <xsl:apply-templates select="mods:name" mode="printName"/>
-            </xsl:if>
-            <xsl:if test="$msg">
-                <p>
-                    <xsl:copy-of select="$msg"/>
-                </p>
-            </xsl:if>
-        </xsl:if>
-      </div>
-    </div>
-  </xsl:template>
+                        <xsl:with-param name="doiResolver" select="$MCR.DOI.Resolver.MasterURL" />
+                        <xsl:with-param name="urnResolver" select="$MCR.URN.Resolver.MasterURL" />
+                    </xsl:call-template>
+                    <xsl:call-template name="printAuthorName">
+                        <xsl:with-param name="node" select="mods:name" />
+                    </xsl:call-template>
+                </xsl:if>
+            </div>
+        </div>
+    </xsl:template>
 
   <xsl:template name="debug-rights">
     <xsl:variable name="lbr" select="'&#x0a;'" />
@@ -268,27 +266,4 @@
             </xsl:if>
         </dl>
     </xsl:template>
-
-    <!-- copied from modsmetadata.xsl -->
-    <xsl:template match="mods:name" mode="printName">
-        <xsl:choose>
-            <xsl:when test="mods:namePart">
-                <xsl:choose>
-                    <xsl:when test="mods:namePart[@type='given'] and mods:namePart[@type='family']">
-                        <xsl:value-of
-                                select="concat(mods:namePart[@type='family'], ', ',mods:namePart[@type='given'])"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:value-of select="mods:namePart"/>
-                    </xsl:otherwise>
-                </xsl:choose>
-            </xsl:when>
-            <xsl:when test="mods:displayForm">
-                <xsl:value-of select="mods:displayForm"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="."/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
 </xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/mods2csv.xsl b/mir-module/src/main/resources/xsl/mods2csv.xsl
index 214cd3301f..5c948d0845 100644
--- a/mir-module/src/main/resources/xsl/mods2csv.xsl
+++ b/mir-module/src/main/resources/xsl/mods2csv.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet version="1.0" xmlns:mods="http://www.loc.gov/mods/v3" xmlns:xalan="http://xml.apache.org/xalan" xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation" exclude-result-prefixes="xalan i18n">
   <xsl:param name="CurrentLang" />
-
+  <xsl:include href="import/helperTemplates.xsl" />
   <xsl:output
     encoding="UTF-8"
     media-type="text/csv"
@@ -43,7 +43,9 @@
         <xsl:if test="position()!=1">
           <xsl:value-of select="'; '" />
         </xsl:if>
-        <xsl:apply-templates select="." mode="printName" />
+        <xsl:call-template name="printAuthorName">
+          <xsl:with-param name="node" select="mods:name" />
+        </xsl:call-template>
       </xsl:for-each>
     <xsl:text>&quot;;</xsl:text>
 
@@ -53,7 +55,9 @@
         <xsl:if test="position()!=1">
           <xsl:value-of select="'; '" />
         </xsl:if>
-        <xsl:apply-templates select="." mode="printName" />
+        <xsl:call-template name="printAuthorName">
+          <xsl:with-param name="node" select="mods:name" />
+        </xsl:call-template>
       </xsl:for-each>
     <xsl:text>&quot;;</xsl:text>
 
@@ -63,7 +67,9 @@
         <xsl:if test="position()!=1">
           <xsl:value-of select="'; '" />
         </xsl:if>
-        <xsl:apply-templates select="." mode="printName" />
+        <xsl:call-template name="printAuthorName">
+          <xsl:with-param name="node" select="mods:name" />
+        </xsl:call-template>
       </xsl:for-each>
     <xsl:text>&quot;;</xsl:text>
 
@@ -78,7 +84,9 @@
         <xsl:if test="position()!=1">
           <xsl:value-of select="'; '" />
         </xsl:if>
-        <xsl:apply-templates select="." mode="printName" />
+        <xsl:call-template name="printAuthorName">
+          <xsl:with-param name="node" select="mods:name" />
+        </xsl:call-template>
       </xsl:for-each>
     <xsl:text>&quot;;</xsl:text>
 
@@ -231,27 +239,7 @@
      </xsl:choose>
   </xsl:template>
 
-  <!-- copied from modsmetadata.xsl -->
-  <xsl:template match="mods:name" mode="printName">
-    <xsl:choose>
-      <xsl:when test="mods:namePart">
-        <xsl:choose>
-          <xsl:when test="mods:namePart[@type='given'] and mods:namePart[@type='family']">
-            <xsl:value-of select="concat(mods:namePart[@type='family'], ', ',mods:namePart[@type='given'])" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="mods:namePart" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="mods:displayForm">
-        <xsl:value-of select="mods:displayForm" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="." />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
+
 
   <xsl:template match="mods:extent" mode="printExtent">
     <xsl:choose>