Attachment #74226 for bug #14716

View | Details | Raw Unified | Return to bug 14716
Collapse All | Expand All




  xmlns:marc="http://www.loc.gov/MARC21/slim"
  xmlns:items="http://www.koha-community.org/items"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:str="http://exslt.org/strings"
  exclude-result-prefixes="marc items str">
    <xsl:import href="MARC21slimUtils.xsl"/>
    <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
    <xsl:template match="/">

        <span class="results_summary series"><span class="label">Series: </span>
        <!-- 440 -->
        <xsl:for-each select="marc:datafield[@tag=440]">
            <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
            <xsl:call-template name="chopPunctuation">
                            <xsl:with-param name="chopString">
                                <xsl:call-template name="subfieldSelect">


        <!-- 490 Series not traced, Ind1 = 0 -->
        <xsl:for-each select="marc:datafield[@tag=490][@ind1!=1]">
            <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
                        <xsl:call-template name="chopPunctuation">
                            <xsl:with-param name="chopString">
                                <xsl:call-template name="subfieldSelect">

            <xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
                <xsl:choose>
                    <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
                        <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:subfield[@code='w'], true())"/></xsl:attribute>
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
                                    <xsl:call-template name="subfieldSelect">

                        </a>
                    </xsl:when>
                    <xsl:otherwise>
                        <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
                                    <xsl:call-template name="subfieldSelect">

                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=rcn:<xsl:value-of select="marc:controlfield[@tag=001]"/>+and+(bib-level:a+or+bib-level:b)</xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Host-item:<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:text>Show analytics</xsl:text>

                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=rcn:<xsl:value-of select="marc:controlfield[@tag=001]"/>+not+(bib-level:a+or+bib-level:b)</xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:text>Show volumes</xsl:text>

                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:value-of select="translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', '')" />

                        </xsl:if>
                        <xsl:text> </xsl:text>
                        <xsl:if test="marc:subfield[@code='b']">
                        <a>
                            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Provider:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='b'], true())"/>"</xsl:attribute>
                            <xsl:call-template name="subfieldSelect">
                                <xsl:with-param name="codes">b</xsl:with-param>
                            </xsl:call-template>

                        <xsl:with-param name="delimeter"> AND </xsl:with-param>
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
                        <xsl:with-param name="urlencode">1</xsl:with-param>
                    </xsl:call-template>
                </xsl:attribute>
            </xsl:when>

            <!-- #1807 Strip unwanted parenthesis from subjects for searching -->
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'],'()',''), true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>


                                    <xsl:with-param name="delimeter"> AND </xsl:with-param>
                                    <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
                                    <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
                                    <xsl:with-param name="urlencode">1</xsl:with-param>
                                </xsl:call-template>
                                </xsl:attribute>
                            </xsl:when>

                    </a>
                </xsl:when>
                <xsl:otherwise>
                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f773, '()', ''), true())"/></xsl:attribute>
                        <xsl:value-of select="$f773"/>
                    </a>
                    <xsl:if test="marc:subfield[@code='g']"><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='g']"/></xsl:if>

                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f775, '()', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:call-template name="subfieldSelect">

                    </a>
                </xsl:when>
                <xsl:otherwise>
                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
                        <xsl:value-of select="translate($f780, '()', '')"/>
                    </a>
                </xsl:otherwise>

                    </a>
                </xsl:when>
                <xsl:otherwise>
                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
                        <xsl:value-of select="translate($f785, '()', '')"/>
                    </a>
                </xsl:otherwise>

        <a>
        <xsl:choose>
            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
            </xsl:otherwise>
        </xsl:choose>
        <xsl:choose>

        <xsl:param name="subdivDelimiter"/>
        <xsl:param name="prefix"/>
        <xsl:param name="suffix"/>
        <xsl:param name="urlencode"/>
        <xsl:variable name="str">
            <xsl:for-each select="marc:subfield">
                <xsl:if test="contains($codes, @code)">

                </xsl:if>
            </xsl:for-each>
        </xsl:variable>
        <xsl:choose>
            <xsl:when test="$urlencode=1">
                <xsl:value-of select="str:encode-uri(substring($str,1,string-length($str)-string-length($delimeter)), true())"/>
            </xsl:when>
            <xsl:otherwise>
                <xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
            </xsl:otherwise>
        </xsl:choose>
    </xsl:template>

</xsl:stylesheet>

Lines 5-11 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-2 / +3 lines)
5	xmlns:marc="http://www.loc.gov/MARC21/slim"	5	xmlns:marc="http://www.loc.gov/MARC21/slim"
6	xmlns:items="http://www.koha-community.org/items"	6	xmlns:items="http://www.koha-community.org/items"
7	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"	7	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
8	exclude-result-prefixes="marc items">	8	xmlns:str="http://exslt.org/strings"
		9	exclude-result-prefixes="marc items str">
9	<xsl:import href="MARC21slimUtils.xsl"/>	10	<xsl:import href="MARC21slimUtils.xsl"/>
10	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>	11	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
11	<xsl:key name="item-by-status" match="items:item" use="items:status"/>	12	<xsl:key name="item-by-status" match="items:item" use="items:status"/>
Lines 355-361 Link Here
355	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>	356	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
356	</xsl:when>	357	</xsl:when>
357	<xsl:otherwise>	358	<xsl:otherwise>
358	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>	359	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
359	</xsl:otherwise>	360	</xsl:otherwise>
360	</xsl:choose>	361	</xsl:choose>
361	<xsl:call-template name="chopPunctuation">	362	<xsl:call-template name="chopPunctuation">

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl (-4 / +17 lines)
1	<?xml version='1.0'?>	1	<?xml version='1.0'?>
2	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>	2	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>
3	<xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="marc">	3	<xsl:stylesheet version="1.0"
		4	xmlns:marc="http://www.loc.gov/MARC21/slim"
		5	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
		6	xmlns:str="http://exslt.org/strings"
		7	exclude-result-prefixes="marc">
4	<xsl:template name="datafield">	8	<xsl:template name="datafield">
5	<xsl:param name="tag"/>	9	<xsl:param name="tag"/>
6	<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>	10	<xsl:param name="ind1"><xsl:text> </xsl:text></xsl:param>
Lines 27-32 Link Here
27	<xsl:param name="subdivDelimiter"/>	31	<xsl:param name="subdivDelimiter"/>
28	<xsl:param name="prefix"/>	32	<xsl:param name="prefix"/>
29	<xsl:param name="suffix"/>	33	<xsl:param name="suffix"/>
		34	<xsl:param name="urlencode"/>
30	<xsl:variable name="str">	35	<xsl:variable name="str">
31	<xsl:for-each select="marc:subfield">	36	<xsl:for-each select="marc:subfield">
32	<xsl:if test="contains($codes, @code)">	37	<xsl:if test="contains($codes, @code)">
Lines 37-43 Link Here
37	</xsl:if>	42	</xsl:if>
38	</xsl:for-each>	43	</xsl:for-each>
39	</xsl:variable>	44	</xsl:variable>
40	<xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>	45	<xsl:choose>
		46	<xsl:when test="$urlencode=1">
		47	<xsl:value-of select="str:encode-uri(substring($str,1,string-length($str)-string-length($delimeter)) )"/>
		48	</xsl:when>
		49	<xsl:otherwise>
		50	<xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
		51	</xsl:otherwise>
		52	</xsl:choose>
41	</xsl:template>	53	</xsl:template>
42		54
43	<xsl:template name="subfieldSelectSpan">	55	<xsl:template name="subfieldSelectSpan">
Lines 197-203 Link Here
197	</xsl:when>	209	</xsl:when>
198	<xsl:when test="boolean($index)">	210	<xsl:when test="boolean($index)">
199	<a>	211	<a>
200	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:value-of select="$index"/>:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>	212	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:value-of select="str:encode-uri($index, true())"/>:<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/></xsl:attribute>
201	<xsl:value-of select="$str"/>	213	<xsl:value-of select="$str"/>
202	</a>	214	</a>
203	</xsl:when>	215	</xsl:when>
Lines 271-277 Link Here
271	<xsl:choose>	283	<xsl:choose>
272	<xsl:when test="$url='1'">	284	<xsl:when test="$url='1'">
273	<xsl:if test="$field/marc:subfield[@code='b']">	285	<xsl:if test="$field/marc:subfield[@code='b']">
274	<a href="/cgi-bin/koha/catalogue/search.pl?q=Provider:{$field/marc:subfield[@code='b']}">	286	<a>
		287	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Provider:<xsl:value-of select="str:encode-uri($field/marc:subfield[@code='b'], true())"/></xsl:attribute>
275	<xsl:call-template name="subfieldSelect">	288	<xsl:call-template name="subfieldSelect">
276	<xsl:with-param name="codes">b</xsl:with-param>	289	<xsl:with-param name="codes">b</xsl:with-param>
277	</xsl:call-template>	290	</xsl:call-template>




  xmlns:items="http://www.koha-community.org/items"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:str="http://exslt.org/strings"
  exclude-result-prefixes="marc items str">
    <xsl:import href="MARC21slimUtils.xsl"/>
    <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>


        <span class="results_summary series"><span class="label">Series: </span>
        <!-- 440 -->
        <xsl:for-each select="marc:datafield[@tag=440]">
            <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
            <xsl:call-template name="chopPunctuation">
                            <xsl:with-param name="chopString">
                                <xsl:call-template name="subfieldSelect">


        <!-- 490 Series not traced, Ind1 = 0 -->
        <xsl:for-each select="marc:datafield[@tag=490][@ind1!=1]">
            <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
                        <xsl:call-template name="chopPunctuation">
                            <xsl:with-param name="chopString">
                                <xsl:call-template name="subfieldSelect">

            <xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
                <xsl:choose>
                    <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
                        <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:subfield[@code='w'], true())"/></xsl:attribute>
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
                                    <xsl:call-template name="subfieldSelect">

                        </a>
                    </xsl:when>
                    <xsl:otherwise>
                        <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
                                    <xsl:call-template name="subfieldSelect">

            <a>
            <xsl:choose>
            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:controlfield[@tag=001], true())"/>+and+(bib-level:a+or+bib-level:b)</xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Host-item:<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:text>Show analytics</xsl:text>

            <a>
            <xsl:choose>
            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:controlfield[@tag=001], true())"/>+not+(bib-level:a+or+bib-level:b)</xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:text>Show volumes</xsl:text>

                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
            </xsl:when>
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', ''), true())"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:value-of select="translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', '')" />

                     </xsl:if>
                     <xsl:text> </xsl:text>
                     <xsl:if test="marc:subfield[@code='b']">
                     <span property="name"><a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Provider:<xsl:value-of select="str:encode-uri(marc:subfield[@code='b'], true())"/></xsl:attribute>
                         <xsl:call-template name="subfieldSelect">
                             <xsl:with-param name="codes">b</xsl:with-param>
                         </xsl:call-template>

                        <xsl:with-param name="delimeter"> AND </xsl:with-param>
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
                        <xsl:with-param name="urlencode">1</xsl:with-param>
                    </xsl:call-template>
                </xsl:attribute>
            </xsl:when>
                <!-- #1807 Strip unwanted parenthesis from subjects for searching -->
            <xsl:otherwise>
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'],'()',''), true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
            </xsl:otherwise>
            </xsl:choose>
            <xsl:call-template name="chopPunctuation">

                                        <xsl:with-param name="delimeter"> AND </xsl:with-param>
                                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
                                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
                                        <xsl:with-param name="urlencode">1</xsl:with-param>
                                    </xsl:call-template>
                                    </xsl:attribute>
                                </xsl:when>
                                <xsl:otherwise>
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
                                </xsl:otherwise>
                            </xsl:choose>
                        <xsl:call-template name="subfieldSelect">

                        <xsl:text>/cgi-bin/koha/opac-search.pl?q=control-number:</xsl:text>
                        <xsl:call-template name="extractControlNumber">
                            <xsl:with-param name="subfieldW">
                                <xsl:value-of select="str:encode-uri(marc:subfield[@code='w'], true())"/>
                            </xsl:with-param>
                        </xsl:call-template>
                    </xsl:attribute>

        <xsl:param name="subdivDelimiter"/>
        <xsl:param name="prefix"/>
        <xsl:param name="suffix"/>
        <xsl:param name="urlencode"/>
        <xsl:variable name="str">
            <xsl:for-each select="marc:subfield">
                <xsl:if test="contains($codes, @code)">

                </xsl:if>
            </xsl:for-each>
        </xsl:variable>
        <xsl:choose>
            <xsl:when test="$urlencode=1">
                <xsl:value-of select="str:encode-uri(substring($str,1,string-length($str)-string-length($delimeter)), true())"/>
            </xsl:when>
            <xsl:otherwise>
                <xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
            </xsl:otherwise>
        </xsl:choose>
    </xsl:template>
</xsl:stylesheet>




                            </xsl:when>
                            <xsl:when test="boolean($index)">
                                <a>
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="str:encode-uri($index, true())"/>:<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/></xsl:attribute>
                                    <xsl:value-of select="$str"/>
                                </a>
                            </xsl:when>

            <xsl:choose>
                <xsl:when test="$url='1'">
                    <xsl:if test="$field/marc:subfield[@code='b']">
                         <a>
                         <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Provider:<xsl:value-of select="str:encode-uri($field/marc:subfield[@code='b'], true())"/>"</xsl:attribute>
                         <xsl:call-template name="subfieldSelect">
                             <xsl:with-param name="codes">b</xsl:with-param>
                         </xsl:call-template>
- 

Return to bug 14716

Lines 7-13 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-15 / +25 lines)
7	xmlns:items="http://www.koha-community.org/items"	7	xmlns:items="http://www.koha-community.org/items"
8	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"	8	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
9	xmlns:str="http://exslt.org/strings"	9	xmlns:str="http://exslt.org/strings"
10	exclude-result-prefixes="marc items">	10	exclude-result-prefixes="marc items str">
11	<xsl:import href="MARC21slimUtils.xsl"/>	11	<xsl:import href="MARC21slimUtils.xsl"/>
12	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>	12	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
13		13
Lines 206-212 Link Here
206	<span class="results_summary series"><span class="label">Series: </span>	206	<span class="results_summary series"><span class="label">Series: </span>
207	<!-- 440 -->	207	<!-- 440 -->
208	<xsl:for-each select="marc:datafield[@tag=440]">	208	<xsl:for-each select="marc:datafield[@tag=440]">
209	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>	209	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
210	<xsl:call-template name="chopPunctuation">	210	<xsl:call-template name="chopPunctuation">
211	<xsl:with-param name="chopString">	211	<xsl:with-param name="chopString">
212	<xsl:call-template name="subfieldSelect">	212	<xsl:call-template name="subfieldSelect">
Lines 221-227 Link Here
221		221
222	<!-- 490 Series not traced, Ind1 = 0 -->	222	<!-- 490 Series not traced, Ind1 = 0 -->
223	<xsl:for-each select="marc:datafield[@tag=490][@ind1!=1]">	223	<xsl:for-each select="marc:datafield[@tag=490][@ind1!=1]">
224	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>	224	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
225	<xsl:call-template name="chopPunctuation">	225	<xsl:call-template name="chopPunctuation">
226	<xsl:with-param name="chopString">	226	<xsl:with-param name="chopString">
227	<xsl:call-template name="subfieldSelect">	227	<xsl:call-template name="subfieldSelect">
Lines 238-244 Link Here
238	<xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">	238	<xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
239	<xsl:choose>	239	<xsl:choose>
240	<xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">	240	<xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
241	<a href="/cgi-bin/koha/opac-search.pl?q=rcn:{marc:subfield[@code='w']}">	241	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:subfield[@code='w'], true())"/></xsl:attribute>
242	<xsl:call-template name="chopPunctuation">	242	<xsl:call-template name="chopPunctuation">
243	<xsl:with-param name="chopString">	243	<xsl:with-param name="chopString">
244	<xsl:call-template name="subfieldSelect">	244	<xsl:call-template name="subfieldSelect">
Lines 249-255 Link Here
249	</a>	249	</a>
250	</xsl:when>	250	</xsl:when>
251	<xsl:otherwise>	251	<xsl:otherwise>
252	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>	252	<a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se,phr:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>"</xsl:attribute>
253	<xsl:call-template name="chopPunctuation">	253	<xsl:call-template name="chopPunctuation">
254	<xsl:with-param name="chopString">	254	<xsl:with-param name="chopString">
255	<xsl:call-template name="subfieldSelect">	255	<xsl:call-template name="subfieldSelect">
Lines 275-284 Link Here
275	<a>	275	<a>
276	<xsl:choose>	276	<xsl:choose>
277	<xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">	277	<xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
278	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="marc:controlfield[@tag=001]"/>+and+(bib-level:a+or+bib-level:b)</xsl:attribute>	278	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:controlfield[@tag=001], true())"/>+and+(bib-level:a+or+bib-level:b)</xsl:attribute>
279	</xsl:when>	279	</xsl:when>
280	<xsl:otherwise>	280	<xsl:otherwise>
281	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Host-item:<xsl:value-of select="translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', '')"/></xsl:attribute>	281	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Host-item:<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/></xsl:attribute>
282	</xsl:otherwise>	282	</xsl:otherwise>
283	</xsl:choose>	283	</xsl:choose>
284	<xsl:text>Show analytics</xsl:text>	284	<xsl:text>Show analytics</xsl:text>
Lines 292-301 Link Here
292	<a>	292	<a>
293	<xsl:choose>	293	<xsl:choose>
294	<xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">	294	<xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
295	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="marc:controlfield[@tag=001]"/>+not+(bib-level:a+or+bib-level:b)</xsl:attribute>	295	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:controlfield[@tag=001], true())"/>+not+(bib-level:a+or+bib-level:b)</xsl:attribute>
296	</xsl:when>	296	</xsl:when>
297	<xsl:otherwise>	297	<xsl:otherwise>
298	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', '')"/></xsl:attribute>	298	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/></xsl:attribute>
299	</xsl:otherwise>	299	</xsl:otherwise>
300	</xsl:choose>	300	</xsl:choose>
301	<xsl:text>Show volumes</xsl:text>	301	<xsl:text>Show volumes</xsl:text>
Lines 313-319 Link Here
313	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>	313	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
314	</xsl:when>	314	</xsl:when>
315	<xsl:otherwise>	315	<xsl:otherwise>
316	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', '')"/></xsl:attribute>	316	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', ''), true())"/></xsl:attribute>
317	</xsl:otherwise>	317	</xsl:otherwise>
318	</xsl:choose>	318	</xsl:choose>
319	<xsl:value-of select="translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', '')" />	319	<xsl:value-of select="translate(//marc:datafield[@tag=245]/marc:subfield[@code='a'], '.', '')" />
Lines 356-362 Link Here
356	</xsl:if>	356	</xsl:if>
357	<xsl:text> </xsl:text>	357	<xsl:text> </xsl:text>
358	<xsl:if test="marc:subfield[@code='b']">	358	<xsl:if test="marc:subfield[@code='b']">
359	<span property="name"><a href="/cgi-bin/koha/opac-search.pl?q=Provider:{marc:subfield[@code='b']}">	359	<span property="name"><a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Provider:<xsl:value-of select="str:encode-uri(marc:subfield[@code='b'], true())"/></xsl:attribute>
360	<xsl:call-template name="subfieldSelect">	360	<xsl:call-template name="subfieldSelect">
361	<xsl:with-param name="codes">b</xsl:with-param>	361	<xsl:with-param name="codes">b</xsl:with-param>
362	</xsl:call-template>	362	</xsl:call-template>
Lines 733-744 Link Here
733	<xsl:with-param name="delimeter"> AND </xsl:with-param>	733	<xsl:with-param name="delimeter"> AND </xsl:with-param>
734	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>	734	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
735	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>	735	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
		736	<xsl:with-param name="urlencode">1</xsl:with-param>
736	</xsl:call-template>	737	</xsl:call-template>
737	</xsl:attribute>	738	</xsl:attribute>
738	</xsl:when>	739	</xsl:when>
739	<!-- #1807 Strip unwanted parenthesis from subjects for searching -->	740	<!-- #1807 Strip unwanted parenthesis from subjects for searching -->
740	<xsl:otherwise>	741	<xsl:otherwise>
741	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="translate(marc:subfield[@code='a'],'()','')"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>	742	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'],'()',''), true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
742	</xsl:otherwise>	743	</xsl:otherwise>
743	</xsl:choose>	744	</xsl:choose>
744	<xsl:call-template name="chopPunctuation">	745	<xsl:call-template name="chopPunctuation">
Lines 787-797 Link Here
787	<xsl:with-param name="delimeter"> AND </xsl:with-param>	788	<xsl:with-param name="delimeter"> AND </xsl:with-param>
788	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>	789	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
789	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>	790	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
		791	<xsl:with-param name="urlencode">1</xsl:with-param>
790	</xsl:call-template>	792	</xsl:call-template>
791	</xsl:attribute>	793	</xsl:attribute>
792	</xsl:when>	794	</xsl:when>
793	<xsl:otherwise>	795	<xsl:otherwise>
794	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="marc:subfield[@code='a']"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>	796	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
795	</xsl:otherwise>	797	</xsl:otherwise>
796	</xsl:choose>	798	</xsl:choose>
797	<xsl:call-template name="subfieldSelect">	799	<xsl:call-template name="subfieldSelect">
Lines 836-842 Link Here
836	<xsl:text>/cgi-bin/koha/opac-search.pl?q=control-number:</xsl:text>	838	<xsl:text>/cgi-bin/koha/opac-search.pl?q=control-number:</xsl:text>
837	<xsl:call-template name="extractControlNumber">	839	<xsl:call-template name="extractControlNumber">
838	<xsl:with-param name="subfieldW">	840	<xsl:with-param name="subfieldW">
839	<xsl:value-of select="marc:subfield[@code='w']"/>	841	<xsl:value-of select="str:encode-uri(marc:subfield[@code='w'], true())"/>
840	</xsl:with-param>	842	</xsl:with-param>
841	</xsl:call-template>	843	</xsl:call-template>
842	</xsl:attribute>	844	</xsl:attribute>
Lines 1660-1665 Link Here
1660	<xsl:param name="subdivDelimiter"/>	1662	<xsl:param name="subdivDelimiter"/>
1661	<xsl:param name="prefix"/>	1663	<xsl:param name="prefix"/>
1662	<xsl:param name="suffix"/>	1664	<xsl:param name="suffix"/>
		1665	<xsl:param name="urlencode"/>
1663	<xsl:variable name="str">	1666	<xsl:variable name="str">
1664	<xsl:for-each select="marc:subfield">	1667	<xsl:for-each select="marc:subfield">
1665	<xsl:if test="contains($codes, @code)">	1668	<xsl:if test="contains($codes, @code)">
Lines 1670-1675 Link Here
1670	</xsl:if>	1673	</xsl:if>
1671	</xsl:for-each>	1674	</xsl:for-each>
1672	</xsl:variable>	1675	</xsl:variable>
1673	<xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>	1676	<xsl:choose>
		1677	<xsl:when test="$urlencode=1">
		1678	<xsl:value-of select="str:encode-uri(substring($str,1,string-length($str)-string-length($delimeter)), true())"/>
		1679	</xsl:when>
		1680	<xsl:otherwise>
		1681	<xsl:value-of select="substring($str,1,string-length($str)-string-length($delimeter))"/>
		1682	</xsl:otherwise>
		1683	</xsl:choose>
1674	</xsl:template>	1684	</xsl:template>
1675	</xsl:stylesheet>	1685	</xsl:stylesheet>