Bug 32794: Expand tests for access method in XLST files

This patch expands the checks for 856u to check for mailto, and adds a few conditiona
checks of the first indicator to cover more methods

Reference: https://www.oclc.org/bibformats/en/8xx/856.html

To test:
1 - Edit a record and add a few 856 fields:
    856 0 0 $umailto:test@example.org
    856 0 0 $utest@example.org
    856 2 0 $utelnet://pucc.princeton.edu
    856 2 0 $upucc.princeton.edu
    856 3 0 $u8885555555
2 - View staff details and results and opac details and results
3 - Note all links have been prepended with http://
4 - Apply patch
5 - Refresh all views, ensure links are correctly formed

Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index c5fd064..661d61a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -927,14 +927,23 @@
             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
             <a>
                 <xsl:attribute name="href">
-                    <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
+                    <xsl:if test="not(contains(marc:subfield[@code='u'],'://') or contains(marc:subfield[@code='u'],'mailto:'))">
                         <xsl:choose>
                             <xsl:when test="@ind1=7">
                                 <xsl:value-of select="marc:subfield[@code='2']"/><xsl:text>://</xsl:text>
                             </xsl:when>
+                            <xsl:when test="@ind1=0">
+                                <xsl:text>mailto:</xsl:text>
+                            </xsl:when>
                             <xsl:when test="@ind1=1">
                                 <xsl:text>ftp://</xsl:text>
                             </xsl:when>
+                            <xsl:when test="@ind1=2">
+                                <xsl:text>telnet://</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="@ind1=3">
+                                <xsl:text>tel:</xsl:text>
+                            </xsl:when>
                             <xsl:otherwise>
                                 <xsl:text>http://</xsl:text>
                             </xsl:otherwise>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index fa94894..902751a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -963,14 +963,23 @@
                 <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                 <a>
                     <xsl:attribute name="href">
-                        <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
+                        <xsl:if test="not(contains(marc:subfield[@code='u'],'://') or contains(marc:subfield[@code='u'],'mailto:'))">
                             <xsl:choose>
                                 <xsl:when test="@ind1=7">
                                     <xsl:value-of select="marc:subfield[@code='2']"/><xsl:text>://</xsl:text>
                                 </xsl:when>
+                                <xsl:when test="@ind1=0">
+                                    <xsl:text>mailto:</xsl:text>
+                                </xsl:when>
                                 <xsl:when test="@ind1=1">
                                     <xsl:text>ftp://</xsl:text>
                                 </xsl:when>
+                                <xsl:when test="@ind1=2">
+                                    <xsl:text>telnet://</xsl:text>
+                                </xsl:when>
+                                <xsl:when test="@ind1=3">
+                                    <xsl:text>tel:</xsl:text>
+                                </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:text>http://</xsl:text>
                                 </xsl:otherwise>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 34a6e0b..429ad70 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1046,14 +1046,23 @@
                                     </xsl:when>
                                     <xsl:otherwise>
                                         <xsl:attribute name="href">
-                                            <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
+                                            <xsl:if test="not(contains(marc:subfield[@code='u'],'://') or contains(marc:subfield[@code='u'],'mailto:'))">
                                                 <xsl:choose>
                                                     <xsl:when test="@ind1=7">
                                                         <xsl:value-of select="marc:subfield[@code='2']"/><xsl:text>://</xsl:text>
                                                     </xsl:when>
+                                                    <xsl:when test="@ind1=0">
+                                                        <xsl:text>mailto:</xsl:text>
+                                                    </xsl:when>
                                                     <xsl:when test="@ind1=1">
                                                         <xsl:text>ftp://</xsl:text>
                                                     </xsl:when>
+                                                    <xsl:when test="@ind1=2">
+                                                        <xsl:text>telnet://</xsl:text>
+                                                    </xsl:when>
+                                                    <xsl:when test="@ind1=3">
+                                                        <xsl:text>tel:</xsl:text>
+                                                    </xsl:when>
                                                     <xsl:otherwise>
                                                         <xsl:text>http://</xsl:text>
                                                     </xsl:otherwise>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 9e7a16a..ffd4e26 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -1176,14 +1176,23 @@
                                </xsl:when>
                                <xsl:otherwise>
                     <xsl:attribute name="href">
-                        <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
+                        <xsl:if test="not(contains(marc:subfield[@code='u'],'://') or contains(marc:subfield[@code='u'],'mailto:'))">
                             <xsl:choose>
                                 <xsl:when test="@ind1=7">
                                     <xsl:value-of select="marc:subfield[@code='2']"/><xsl:text>://</xsl:text>
                                 </xsl:when>
+                                <xsl:when test="@ind1=0">
+                                    <xsl:text>mailto:</xsl:text>
+                                </xsl:when>
                                 <xsl:when test="@ind1=1">
                                     <xsl:text>ftp://</xsl:text>
                                 </xsl:when>
+                                <xsl:when test="@ind1=2">
+                                    <xsl:text>telnet://</xsl:text>
+                                </xsl:when>
+                                <xsl:when test="@ind1=3">
+                                    <xsl:text>tel:</xsl:text>
+                                </xsl:when>
                                 <xsl:otherwise>
                                     <xsl:text>http://</xsl:text>
                                 </xsl:otherwise>