From 29bbb698f645426da393b7d5b3cb60ab44e2d102 Mon Sep 17 00:00:00 2001
From: Thomas Scheffler <github@yagee.de>
Date: Fri, 20 Oct 2023 13:25:54 +0200
Subject: [PATCH 1/2] MIR-1247 add filter for additional mods:role and
 mods:roleTermin

---
 mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
index e8bf42b9a4..042f677ba3 100644
--- a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
@@ -119,6 +119,14 @@
     </xsl:copy>
   </xsl:template>
 
+  <xsl:template match="mods:role[preceding-sibling::mods:role]">
+    <xsl:comment>removed additional role due to MIR-1247</xsl:comment>
+  </xsl:template>
+
+  <xsl:template match="mods:roleTerm[@authority and @authority != 'marcrelator']">
+    <xsl:comment>removed additional roleTerm due to MIR-1247</xsl:comment>
+  </xsl:template>
+
   <!-- Remove this mods:classification entry, will be created again while saving using mods:accessCondtition (see MIR-161) -->
   <xsl:template match="mods:classification[@authority='accessRestriction']">
     <!-- do nothing -->

From b411b217ac6e7625bc658efa9dcd51a5a2002fa5 Mon Sep 17 00:00:00 2001
From: Thomas Scheffler <github@yagee.de>
Date: Fri, 20 Oct 2023 15:20:05 +0200
Subject: [PATCH 2/2] MIR-1247 better fix to filter mods:role

---
 .../resources/xsl/editor/mods2xeditor.xsl     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
index 042f677ba3..20de626314 100644
--- a/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
+++ b/mir-module/src/main/resources/xsl/editor/mods2xeditor.xsl
@@ -13,6 +13,8 @@
   <xsl:param name="WebApplicationBaseURL" />
   <xsl:param name="MIR.PPN.DatabaseList" select="'gvk'" />
 
+  <xsl:variable name="marcrelator" select="document('classification:metadata:-1:children:marcrelator')" />
+
   <!-- put value string (after authority URI) in attribute valueURIxEditor, but only if it contains # -->
   <xsl:template match="@valueURI">
     <xsl:choose>
@@ -119,7 +121,26 @@
     </xsl:copy>
   </xsl:template>
 
-  <xsl:template match="mods:role[preceding-sibling::mods:role]">
+  <xsl:template match="mods:role[$marcrelator//category/@ID = mods:roleTerm[@authority='marcrelator']/text()][1]">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:template match="mods:role[position() = last()]">
+    <xsl:choose>
+      <xsl:when test="preceding-sibling::mods:role[$marcrelator//category/@ID = mods:roleTerm[@authority='marcrelator']/text()][1]">
+        <xsl:comment>removed additional role due to MIR-1247</xsl:comment>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:copy>
+          <xsl:apply-templates select="@*|node()" />
+        </xsl:copy>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="mods:role">
     <xsl:comment>removed additional role due to MIR-1247</xsl:comment>
   </xsl:template>
 
@@ -127,6 +148,13 @@
     <xsl:comment>removed additional roleTerm due to MIR-1247</xsl:comment>
   </xsl:template>
 
+  <xsl:template match="mods:roleTerm[@authority = 'marcrelator' and not($marcrelator//category/@ID = text())]">
+    <xsl:copy>
+      <xsl:apply-templates select="@*" />
+      <xsl:text>oth</xsl:text>
+    </xsl:copy>
+  </xsl:template>
+
   <!-- Remove this mods:classification entry, will be created again while saving using mods:accessCondtition (see MIR-161) -->
   <xsl:template match="mods:classification[@authority='accessRestriction']">
     <!-- do nothing -->