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

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-8 / +11 lines)
Lines 853-866 Link Here
853
                    <xsl:with-param name="chopString" select="."/>
853
                    <xsl:with-param name="chopString" select="."/>
854
                </xsl:call-template>
854
                </xsl:call-template>
855
        </xsl:for-each>
855
        </xsl:for-each>
856
        <xsl:for-each select="marc:subfield[@code='b']">
856
        <xsl:if test="marc:subfield[@code='b']">
857
            <xsl:value-of select="."/>
857
            <xsl:text>. </xsl:text>
858
            <xsl:choose>
858
            <xsl:for-each select="marc:subfield[@code='b']">
859
                <xsl:when test="position() != last()">
859
                <xsl:value-of select="."/>
860
                    <xsl:text> -- </xsl:text>
860
                <xsl:choose>
861
                </xsl:when>
861
                    <xsl:when test="position() != last()">
862
            </xsl:choose>
862
                        <xsl:text> -- </xsl:text>
863
        </xsl:for-each>
863
                    </xsl:when>
864
                </xsl:choose>
865
            </xsl:for-each>
866
        </xsl:if>
864
        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
867
        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
865
                <xsl:call-template name="subfieldSelect">
868
                <xsl:call-template name="subfieldSelect">
866
                    <xsl:with-param name="codes">cdn</xsl:with-param>
869
                    <xsl:with-param name="codes">cdn</xsl:with-param>
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-3 / +15 lines)
Lines 886-895 Link Here
886
                    <xsl:with-param name="chopString" select="."/>
886
                    <xsl:with-param name="chopString" select="."/>
887
                </xsl:call-template>
887
                </xsl:call-template>
888
        </xsl:for-each>
888
        </xsl:for-each>
889
        <xsl:for-each select="marc:subfield[@code='b']">
889
890
        <xsl:if test="marc:subfield[@code='b']">
891
            <xsl:text>. </xsl:text>
892
            <xsl:for-each select="marc:subfield[@code='b']">
890
                <xsl:value-of select="."/>
893
                <xsl:value-of select="."/>
891
        </xsl:for-each>
894
                <xsl:choose>
892
        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
895
                    <xsl:when test="position() != last()">
896
                        <xsl:text> -- </xsl:text>
897
                    </xsl:when>
898
                </xsl:choose>
899
            </xsl:for-each>
900
        </xsl:if>
901
902
        <xsl:if test="marc:subfield[@code='c'] or
903
                      marc:subfield[@code='d'] or
904
                      marc:subfield[@code='n']">
893
                <xsl:call-template name="subfieldSelect">
905
                <xsl:call-template name="subfieldSelect">
894
                    <xsl:with-param name="codes">cdn</xsl:with-param>
906
                    <xsl:with-param name="codes">cdn</xsl:with-param>
895
                </xsl:call-template>
907
                </xsl:call-template>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-8 / +11 lines)
Lines 1054-1067 Link Here
1054
                    <xsl:with-param name="chopString" select="."/>
1054
                    <xsl:with-param name="chopString" select="."/>
1055
                </xsl:call-template>
1055
                </xsl:call-template>
1056
        </xsl:for-each>
1056
        </xsl:for-each>
1057
        <xsl:for-each select="marc:subfield[@code='b']">
1057
        <xsl:if test="marc:subfield[@code='b']">
1058
            <xsl:value-of select="."/>
1058
            <xsl:text>. </xsl:text>
1059
            <xsl:choose>
1059
            <xsl:for-each select="marc:subfield[@code='b']">
1060
                <xsl:when test="position() != last()">
1060
                <xsl:value-of select="."/>
1061
                    <xsl:text> -- </xsl:text>
1061
                <xsl:choose>
1062
                </xsl:when>
1062
                    <xsl:when test="position() != last()">
1063
            </xsl:choose>
1063
                        <xsl:text> -- </xsl:text>
1064
        </xsl:for-each>
1064
                    </xsl:when>
1065
                </xsl:choose>
1066
            </xsl:for-each>
1067
        </xsl:if>
1065
        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
1068
        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
1066
                <xsl:call-template name="subfieldSelect">
1069
                <xsl:call-template name="subfieldSelect">
1067
                    <xsl:with-param name="codes">cdn</xsl:with-param>
1070
                    <xsl:with-param name="codes">cdn</xsl:with-param>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl (-15 / +19 lines)
Lines 465-475 Link Here
465
465
466
        <xsl:for-each select="marc:datafield[(@tag=110 or @tag=710) and @ind1!='z']">
466
        <xsl:for-each select="marc:datafield[(@tag=110 or @tag=710) and @ind1!='z']">
467
            <xsl:choose>
467
            <xsl:choose>
468
            <xsl:when test="position()=1">
469
		<xsl:text> -- </xsl:text>
470
            </xsl:when>
471
            </xsl:choose>
472
            <xsl:choose>
473
            <xsl:when test="position()=last()">
468
            <xsl:when test="position()=last()">
474
                <xsl:call-template name="nameABCDN"/> 
469
                <xsl:call-template name="nameABCDN"/> 
475
            </xsl:when>
470
            </xsl:when>
Lines 1195-1211 Link Here
1195
1190
1196
    <xsl:template name="nameABCDN">
1191
    <xsl:template name="nameABCDN">
1197
        <xsl:for-each select="marc:subfield[@code='a']">
1192
        <xsl:for-each select="marc:subfield[@code='a']">
1198
                <xsl:call-template name="chopPunctuation">
1193
            <xsl:call-template name="chopPunctuation">
1199
                    <xsl:with-param name="chopString" select="."/>
1194
                <xsl:with-param name="chopString" select="."/>
1200
                </xsl:call-template>
1195
            </xsl:call-template>
1201
        </xsl:for-each>
1196
        </xsl:for-each>
1202
        <xsl:for-each select="marc:subfield[@code='b']">
1197
        <xsl:if test="marc:subfield[@code='b']">
1198
            <xsl:text>. </xsl:text>
1199
            <xsl:for-each select="marc:subfield[@code='b']">
1203
                <xsl:value-of select="."/>
1200
                <xsl:value-of select="."/>
1204
        </xsl:for-each>
1201
                <xsl:choose>
1205
        <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']">
1202
                    <xsl:when test="position() != last()">
1206
                <xsl:call-template name="subfieldSelect">
1203
                        <xsl:text> -- </xsl:text>
1207
                    <xsl:with-param name="codes">cdn</xsl:with-param>
1204
                    </xsl:when>
1208
                </xsl:call-template>
1205
                </xsl:choose>
1206
            </xsl:for-each>
1207
        </xsl:if>
1208
        <xsl:if test="marc:subfield[@code='c'] or
1209
                      marc:subfield[@code='d'] or
1210
                      marc:subfield[@code='n']">
1211
            <xsl:call-template name="subfieldSelect">
1212
                <xsl:with-param name="codes">cdn</xsl:with-param>
1213
            </xsl:call-template>
1209
        </xsl:if>
1214
        </xsl:if>
1210
    </xsl:template>
1215
    </xsl:template>
1211
1216
1212
- 

Return to bug 10957