Attachment #37937 for bug #13433

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




        </span>
        </xsl:if>

        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
            <a>
            <xsl:choose>
            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">

        <xsl:if test="marc:datafield[@tag=655]">
            <span class="results_summary genre"><span class="label">Genre/Form: </span>
                <xsl:for-each select="marc:datafield[@tag=655]">
                    <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="marc:subfield[@code=9]"/></xsl:attribute>
                            </xsl:when>
                            <xsl:when test="$TraceSubjectSubdivisions='1'">
                                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
                                    <xsl:with-param name="codes">avxyz</xsl:with-param>
                                    <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:call-template>
                                </xsl:attribute>
                            </xsl:when>
                            <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="marc:subfield[@code='a']"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
                            </xsl:otherwise>
                        </xsl:choose>
                    <xsl:call-template name="subfieldSelect">
                        <xsl:with-param name="codes">avxyz</xsl:with-param>
                        <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
                    </xsl:call-template>
                    </a>
                    <xsl:if test="position()!=last()"><span class="separator"> | </span></xsl:if>
                </xsl:for-each>
            </span>




        </span>
        </xsl:if>

            <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
                <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
            <span property="keywords">
            <a>
            <xsl:choose>

            <xsl:if test="marc:datafield[@tag=655]">
                <span class="results_summary genre"><span class="label">Genre/Form: </span>
                    <xsl:for-each select="marc:datafield[@tag=655]">
                        <a>
                            <xsl:choose>
                                <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
                                </xsl:when>
                                <xsl:when test="$TraceSubjectSubdivisions='1'">
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
                                        <xsl:with-param name="codes">avxyz</xsl:with-param>
                                        <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: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="marc:subfield[@code='a']"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
                                </xsl:otherwise>    
                            </xsl:choose>
                        </a>
                        <xsl:call-template name="subfieldSelect">
                            <xsl:with-param name="codes">avxyz</xsl:with-param>
                            <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
                            <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
                        </xsl:call-template>
                        <xsl:if test="position()!=last()"><span class="separator"> | </span></xsl:if>
                    </xsl:for-each>
- 

Return to bug 13433

Lines 525-533 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-2 / +23 lines)
525	</span>	525	</span>
526	</xsl:if>	526	</xsl:if>
527		527
528	<xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">	528	<xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
529	<span class="results_summary subjects"><span class="label">Subject(s): </span>	529	<span class="results_summary subjects"><span class="label">Subject(s): </span>
530	<xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">	530	<xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
531	<a>	531	<a>
532	<xsl:choose>	532	<xsl:choose>
533	<xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">	533	<xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
Lines 569-577 Link Here
569	<xsl:if test="marc:datafield[@tag=655]">	569	<xsl:if test="marc:datafield[@tag=655]">
570	<span class="results_summary genre"><span class="label">Genre/Form: </span>	570	<span class="results_summary genre"><span class="label">Genre/Form: </span>
571	<xsl:for-each select="marc:datafield[@tag=655]">	571	<xsl:for-each select="marc:datafield[@tag=655]">
		572	<a>
		573	<xsl:choose>
		574	<xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
		575	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
		576	</xsl:when>
		577	<xsl:when test="$TraceSubjectSubdivisions='1'">
		578	<xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=<xsl:call-template name="subfieldSelect">
		579	<xsl:with-param name="codes">avxyz</xsl:with-param>
		580	<xsl:with-param name="delimeter"> AND </xsl:with-param>
		581	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
		582	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
		583	</xsl:call-template>
		584	</xsl:attribute>
		585	</xsl:when>
		586	<xsl:otherwise>
		587	<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="marc:subfield[@code='a']"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
		588	</xsl:otherwise>
		589	</xsl:choose>
572	<xsl:call-template name="subfieldSelect">	590	<xsl:call-template name="subfieldSelect">
573	<xsl:with-param name="codes">avxyz</xsl:with-param>	591	<xsl:with-param name="codes">avxyz</xsl:with-param>
		592	<xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
		593	<xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
574	</xsl:call-template>	594	</xsl:call-template>
		595	</a>
575	<xsl:if test="position()!=last()"><span class="separator"> \| </span></xsl:if>	596	<xsl:if test="position()!=last()"><span class="separator"> \| </span></xsl:if>
576	</xsl:for-each>	597	</xsl:for-each>
577	</span>	598	</span>

Lines 572-580 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-3 / +23 lines)
572	</span>	572	</span>
573	</xsl:if>	573	</xsl:if>
574		574
575	<xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">	575	<xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
576	<span class="results_summary subjects"><span class="label">Subject(s): </span>	576	<span class="results_summary subjects"><span class="label">Subject(s): </span>
577	<xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">	577	<xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
578	<span property="keywords">	578	<span property="keywords">
579	<a>	579	<a>
580	<xsl:choose>	580	<xsl:choose>
Lines 629-636 Link Here
629	<xsl:if test="marc:datafield[@tag=655]">	629	<xsl:if test="marc:datafield[@tag=655]">
630	<span class="results_summary genre"><span class="label">Genre/Form: </span>	630	<span class="results_summary genre"><span class="label">Genre/Form: </span>
631	<xsl:for-each select="marc:datafield[@tag=655]">	631	<xsl:for-each select="marc:datafield[@tag=655]">
		632	<a>
		633	<xsl:choose>
		634	<xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
		635	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
		636	</xsl:when>
		637	<xsl:when test="$TraceSubjectSubdivisions='1'">
		638	<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelect">
		639	<xsl:with-param name="codes">avxyz</xsl:with-param>
		640	<xsl:with-param name="delimeter"> AND </xsl:with-param>
		641	<xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
		642	<xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
		643	</xsl:call-template>
		644	</xsl:attribute>
		645	</xsl:when>
		646	<xsl:otherwise>
		647	<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>
		648	</xsl:otherwise>
		649	</xsl:choose>
		650	</a>
632	<xsl:call-template name="subfieldSelect">	651	<xsl:call-template name="subfieldSelect">
633	<xsl:with-param name="codes">avxyz</xsl:with-param>	652	<xsl:with-param name="codes">avxyz</xsl:with-param>
		653	<xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
		654	<xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
634	</xsl:call-template>	655	</xsl:call-template>
635	<xsl:if test="position()!=last()"><span class="separator"> \| </span></xsl:if>	656	<xsl:if test="position()!=last()"><span class="separator"> \| </span></xsl:if>
636	</xsl:for-each>	657	</xsl:for-each>
637	-