From 48688b25b85024ea491b88e35b9eedcae0ddb304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nazl=C4=B1=20=C3=87etin?= <nazli@devinim.com.tr>
Date: Tue, 27 Nov 2018 15:24:38 +0000
Subject: [PATCH] Bug 21887: (For OPAC) 856 link problem in XSLT result lists
 and detail page

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl         | 17 ++++++++++++++++-
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl        | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 13d7174740..1b523e05dc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -957,7 +957,22 @@
             <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&amp;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
 	      </xsl:when>
 	      <xsl:otherwise>
-                <xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+              <xsl:attribute name="href">
+                  <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
+                      <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=1">
+                              <xsl:text>ftp://</xsl:text>
+                          </xsl:when>
+                          <xsl:otherwise>
+                              <xsl:text>http://</xsl:text>
+                          </xsl:otherwise>
+                      </xsl:choose>
+                  </xsl:if>
+                  <xsl:value-of select="marc:subfield[@code='u']"/>
+              </xsl:attribute>
 	      </xsl:otherwise>
 	    </xsl:choose>
             <xsl:if test="$OPACURLOpenInNewWindow='1'">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 71e53c843e..6aaa329870 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -1129,7 +1129,22 @@
                       <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&amp;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
-				  <xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+                    <xsl:attribute name="href">
+                        <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
+                            <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=1">
+                                    <xsl:text>ftp://</xsl:text>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:text>http://</xsl:text>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:if>
+                        <xsl:value-of select="marc:subfield[@code='u']"/>
+                    </xsl:attribute>
 				</xsl:otherwise>
 			      </xsl:choose>
                                     <xsl:choose>
-- 
2.11.0