Attachment 166588 Details for Bug 36370 – Bug 36370: Add ContentWarningField to UNIMARC XSLT

[patch] Bug 36370: Add ContentWarningField to UNIMARC XSLT

Bug-36370-Add-ContentWarningField-to-UNIMARC-XSLT.patch (text/plain), 10.26 KB, created by Kyle M Hall (khall) on 2024-05-10 17:13:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2024-05-10 17:13:25 UTC

Size: 10.26 KB

patch

obsolete

>From 0c769a4d934ff5215d30af4057c49aa3994aac30 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Wed, 20 Mar 2024 16:04:14 +0100
>Subject: [PATCH] Bug 36370: Add ContentWarningField to UNIMARC XSLT
>
>Bug 31123 added new feature with preference ContentWarningField.
>Add this behavior to UNMARC XSLT files.
>
>This patch adds new template 'tag_content_warning' in UNIMARCslimUtils.xsl
>called in results and details pages.
>
>New field is placed after 3xx.
>
>Test plan (in both interfaces OPAC and staff):
>1) Create a new field 599 in framework
>2) Set system preference ContentWarningField to 599
>3) Edit a record to add a 599 with text in $a$b and an URL in $u
>4) Perform a search to find this record
>=> Check you see content_warning: <a href="$u">$a</a> $b
>5) Click on details page
>=> Check you see content_warning: <a href="$u">$a</a> $b
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../en/xslt/UNIMARCslim2intranetDetail.xsl | 6 ++++
> .../en/xslt/UNIMARCslim2intranetResults.xsl | 6 ++++
> .../prog/en/xslt/UNIMARCslimUtils.xsl | 36 +++++++++++++++++++
> .../en/xslt/UNIMARCslim2OPACDetail.xsl | 6 ++++
> .../en/xslt/UNIMARCslim2OPACResults.xsl | 6 ++++
> .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 36 +++++++++++++++++++
> 6 files changed, 96 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
>index 25a8d08dee0..982bea8b8b2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
>@@ -16,6 +16,7 @@
> 
> <xsl:template match="marc:record">
> <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
>+ <xsl:variable name="ContentWarningField" select="marc:sysprefs/marc:syspref[@name='ContentWarningField']"/>
> <xsl:variable name="leader" select="marc:leader"/>
> <xsl:variable name="leader6" select="substring($leader,7,1)"/>
> <xsl:variable name="leader7" select="substring($leader,8,1)"/>
>@@ -306,6 +307,11 @@
> 
> </xsl:if>
> 
>+ 
>+ <xsl:call-template name="tag_content_warning">
>+ <xsl:with-param name="tag" select="$ContentWarningField" />
>+ </xsl:call-template>
>+
> <xsl:if test="marc:datafield[@tag=955]">
> 
> SUDOC serial history: 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
>index 624603c6204..8fdabd47eee 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl
>@@ -18,6 +18,7 @@
> 
> <xsl:template match="marc:record">
> <xsl:variable name="IntranetBiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='IntranetBiblioDefaultView']"/>
>+ <xsl:variable name="ContentWarningField" select="marc:sysprefs/marc:syspref[@name='ContentWarningField']"/>
> <xsl:variable name="leader" select="marc:leader"/>
> <xsl:variable name="leader6" select="substring($leader,7,1)"/>
> <xsl:variable name="leader7" select="substring($leader,8,1)"/>
>@@ -77,5 +78,10 @@
> 
> <xsl:call-template name="tag_215" />
> 
>+ 
>+ <xsl:call-template name="tag_content_warning">
>+ <xsl:with-param name="tag" select="$ContentWarningField" />
>+ </xsl:call-template>
>+
> </xsl:template>
> </xsl:stylesheet>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
>index 8860317cbf8..e344fdf7de1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
>@@ -485,4 +485,40 @@
> </xsl:if>
> </xsl:template>
> 
>+ <xsl:template name="tag_content_warning">
>+ <xsl:param name="tag" />
>+ <xsl:if test="marc:datafield[@tag=$tag]">
>+ 
>+ Content warning: 
>+ <xsl:for-each select="marc:datafield[@tag=$tag]">
>+ <xsl:choose>
>+ <xsl:when test="marc:subfield[@code='u']">
>+ <a>
>+ <xsl:attribute name="href">
>+ <xsl:value-of select="marc:subfield[@code='u']"/>
>+ </xsl:attribute>
>+ <xsl:choose>
>+ <xsl:when test="marc:subfield[@code='a']">
>+ <xsl:value-of select="marc:subfield[@code='a']"/>
>+ </xsl:when>
>+ <xsl:otherwise>
>+ <xsl:value-of select="marc:subfield[@code='u']"/>
>+ </xsl:otherwise>
>+ </xsl:choose>
>+ </a>
>+ <xsl:text> </xsl:text>
>+ </xsl:when>
>+ <xsl:when test="not(marc:subfield[@code='u']) and marc:subfield[@code='a']">
>+ <xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text>
>+ </xsl:when>
>+ </xsl:choose>
>+ <xsl:call-template name="subfieldSelect">
>+ <xsl:with-param name="codes">bcdefghijklmnopqrstvwxyz</xsl:with-param>
>+ </xsl:call-template>
>+ <xsl:if test="position()!=last()"><xsl:text> | </xsl:text></xsl:if>
>+ </xsl:for-each>
>+ 
>+ </xsl:if>
>+ </xsl:template>
>+
> </xsl:stylesheet>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
>index f2bebe101fa..0992550b1aa 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
>@@ -22,6 +22,7 @@
> <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
> <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
> <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
>+ <xsl:variable name="ContentWarningField" select="marc:sysprefs/marc:syspref[@name='ContentWarningField']"/>
> 
> <xsl:if test="marc:datafield[@tag=200]">
> <xsl:for-each select="marc:datafield[@tag=200]">
>@@ -347,6 +348,11 @@
> 
> </xsl:if>
> 
>+ 
>+ <xsl:call-template name="tag_content_warning">
>+ <xsl:with-param name="tag" select="$ContentWarningField" />
>+ </xsl:call-template>
>+
> <xsl:if test="marc:datafield[@tag=955]">
> 
> SUDOC serial history: 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
>index b9d36a2d356..51e37782e17 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
>@@ -31,6 +31,7 @@
> <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
> <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
> <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
>+ <xsl:variable name="ContentWarningField" select="marc:sysprefs/marc:syspref[@name='ContentWarningField']"/>
> 
> <xsl:if test="marc:datafield[@tag=200]">
> <xsl:for-each select="marc:datafield[@tag=200]">
>@@ -155,6 +156,11 @@
> 
> <xsl:call-template name="tag_215" />
> 
>+ 
>+ <xsl:call-template name="tag_content_warning">
>+ <xsl:with-param name="tag" select="$ContentWarningField" />
>+ </xsl:call-template>
>+
> 
> Availability: 
> <xsl:choose>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
>index dc02e6fc8e5..d30304b150a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
>@@ -545,4 +545,40 @@
> </xsl:if>
> </xsl:template>
> 
>+ <xsl:template name="tag_content_warning">
>+ <xsl:param name="tag" />
>+ <xsl:if test="marc:datafield[@tag=$tag]">
>+ 
>+ Content warning: 
>+ <xsl:for-each select="marc:datafield[@tag=$tag]">
>+ <xsl:choose>
>+ <xsl:when test="marc:subfield[@code='u']">
>+ <a>
>+ <xsl:attribute name="href">
>+ <xsl:value-of select="marc:subfield[@code='u']"/>
>+ </xsl:attribute>
>+ <xsl:choose>
>+ <xsl:when test="marc:subfield[@code='a']">
>+ <xsl:value-of select="marc:subfield[@code='a']"/>
>+ </xsl:when>
>+ <xsl:otherwise>
>+ <xsl:value-of select="marc:subfield[@code='u']"/>
>+ </xsl:otherwise>
>+ </xsl:choose>
>+ </a>
>+ <xsl:text> </xsl:text>
>+ </xsl:when>
>+ <xsl:when test="not(marc:subfield[@code='u']) and marc:subfield[@code='a']">
>+ <xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text>
>+ </xsl:when>
>+ </xsl:choose>
>+ <xsl:call-template name="subfieldSelect">
>+ <xsl:with-param name="codes">bcdefghijklmnopqrstvwxyz</xsl:with-param>
>+ </xsl:call-template>
>+ <xsl:if test="position()!=last()"><xsl:text> | </xsl:text></xsl:if>
>+ </xsl:for-each>
>+ 
>+ </xsl:if>
>+ </xsl:template>
>+
> </xsl:stylesheet>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 36370: 163554 | 163764 | 166588