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

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-5 / +10 lines)
Lines 1191-1198 Link Here
1191
	                    <xsl:with-param name="codes">
1191
	                    <xsl:with-param name="codes">
1192
	                        <xsl:choose>
1192
	                        <xsl:choose>
1193
	                            <!-- #13383 include subfield e for field 111  -->
1193
	                            <!-- #13383 include subfield e for field 111  -->
1194
	                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
1194
	                            <xsl:when test="@tag=111">abceqt</xsl:when>
1195
	                            <xsl:otherwise>abcdjqt</xsl:otherwise>
1195
	                            <xsl:otherwise>abcjqt</xsl:otherwise>
1196
	                        </xsl:choose>
1196
	                        </xsl:choose>
1197
	                    </xsl:with-param>
1197
	                    </xsl:with-param>
1198
	                </xsl:call-template>
1198
	                </xsl:call-template>
Lines 1203-1213 Link Here
1203
	        </xsl:call-template>
1203
	        </xsl:call-template>
1204
	    </xsl:when>
1204
	    </xsl:when>
1205
	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1205
	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1206
	    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1206
	    <!--#13382 Added all relevant subfields 4, e, and d are handled separately -->
1207
	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1207
	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1208
	        <xsl:variable name="str">
1208
	        <xsl:variable name="str">
1209
	            <xsl:call-template name="subfieldSelect">
1209
	            <xsl:call-template name="subfieldSelect">
1210
	                <xsl:with-param name="codes">abcdfghiklmnoprstux</xsl:with-param>
1210
	                <xsl:with-param name="codes">abcfghiklmnoprstux</xsl:with-param>
1211
	            </xsl:call-template>
1211
	            </xsl:call-template>
1212
	        </xsl:variable>
1212
	        </xsl:variable>
1213
	        <xsl:call-template name="chopPunctuation">
1213
	        <xsl:call-template name="chopPunctuation">
Lines 1220-1226 Link Here
1220
	        </xsl:call-template>
1220
	        </xsl:call-template>
1221
	    </xsl:when>
1221
	    </xsl:when>
1222
	</xsl:choose>
1222
	</xsl:choose>
1223
1223
    <xsl:if test="marc:subfield[@code='d']">
1224
        <span class="authordates">
1225
            <xsl:text> </xsl:text>
1226
            <xsl:value-of select="marc:subfield[@code='d']"/>
1227
        </span>
1228
    </xsl:if>
1224
	<!-- add relator code too between brackets-->
1229
	<!-- add relator code too between brackets-->
1225
    <!-- #13383 include relator code j for field 111 -->
1230
    <!-- #13383 include relator code j for field 111 -->
1226
            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
1231
            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-2 / +8 lines)
Lines 363-370 Link Here
363
                            <xsl:with-param name="codes">
363
                            <xsl:with-param name="codes">
364
                                <xsl:choose>
364
                                <xsl:choose>
365
                                    <!-- #13383 include subfield e for field 111  -->
365
                                    <!-- #13383 include subfield e for field 111  -->
366
                                    <xsl:when test="@tag=111">abcdeqt</xsl:when>
366
                                    <xsl:when test="@tag=111">abceqt</xsl:when>
367
                                    <xsl:otherwise>abcdjqt</xsl:otherwise>
367
                                    <xsl:otherwise>abcjqt</xsl:otherwise>
368
                                </xsl:choose>
368
                                </xsl:choose>
369
                            </xsl:with-param>
369
                            </xsl:with-param>
370
                        </xsl:call-template>
370
                        </xsl:call-template>
Lines 374-379 Link Here
374
                    </xsl:with-param>
374
                    </xsl:with-param>
375
                </xsl:call-template>
375
                </xsl:call-template>
376
            </a>
376
            </a>
377
            <xsl:if test="marc:subfield[@code='d']">
378
                <span class="authordates">
379
                    <xsl:text> </xsl:text>
380
                    <xsl:value-of select="marc:subfield[@code='d']"/>
381
                </span>
382
            </xsl:if>
377
            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
383
            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
378
                <span class="relatorcode">
384
                <span class="relatorcode">
379
                    <xsl:text> [</xsl:text>
385
                    <xsl:text> [</xsl:text>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-4 / +10 lines)
Lines 1291-1298 Link Here
1291
                                    <xsl:with-param name="codes">
1291
                                    <xsl:with-param name="codes">
1292
                                        <xsl:choose>
1292
                                        <xsl:choose>
1293
                                            <!-- #13383 include subfield e for field 111  -->
1293
                                            <!-- #13383 include subfield e for field 111  -->
1294
                                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
1294
                                            <xsl:when test="@tag=111">abceqt</xsl:when>
1295
                                            <xsl:otherwise>abcdjqt</xsl:otherwise>
1295
                                            <xsl:otherwise>abcjqt</xsl:otherwise>
1296
                                        </xsl:choose>
1296
                                        </xsl:choose>
1297
                                    </xsl:with-param>
1297
                                    </xsl:with-param>
1298
                                </xsl:call-template>
1298
                                </xsl:call-template>
Lines 1303-1313 Link Here
1303
                        </xsl:call-template>
1303
                        </xsl:call-template>
1304
                    </xsl:when>
1304
                    </xsl:when>
1305
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1305
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1306
                    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1306
                    <!--#13382 Added all relevant subfields 4, e, and d are handled separately -->
1307
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1307
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1308
                        <xsl:variable name="str">
1308
                        <xsl:variable name="str">
1309
                            <xsl:call-template name="subfieldSelect">
1309
                            <xsl:call-template name="subfieldSelect">
1310
                                <xsl:with-param name="codes">abcdfghiklmnoprstux</xsl:with-param>
1310
                                <xsl:with-param name="codes">abcfghiklmnoprstux</xsl:with-param>
1311
                            </xsl:call-template>
1311
                            </xsl:call-template>
1312
                        </xsl:variable>
1312
                        </xsl:variable>
1313
                        <xsl:call-template name="chopPunctuation">
1313
                        <xsl:call-template name="chopPunctuation">
Lines 1321-1326 Link Here
1321
                    </xsl:when>
1321
                    </xsl:when>
1322
                </xsl:choose>
1322
                </xsl:choose>
1323
                </span></span></span>
1323
                </span></span></span>
1324
                <xsl:if test="marc:subfield[@code='d']">
1325
                    <span class="authordates">
1326
                        <xsl:text> </xsl:text>
1327
                        <xsl:value-of select="marc:subfield[@code='d']"/>
1328
                    </span>
1329
                </xsl:if>
1324
                <!-- #13383 include relator code j for field 111 -->
1330
                <!-- #13383 include relator code j for field 111 -->
1325
                <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
1331
                <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
1326
                    <span class="relatorcode">
1332
                    <span class="relatorcode">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-3 / +8 lines)
Lines 469-476 Link Here
469
                        <xsl:with-param name="codes">
469
                        <xsl:with-param name="codes">
470
                            <xsl:choose>
470
                            <xsl:choose>
471
                                <!-- #13383 include subfield e for field 111  -->
471
                                <!-- #13383 include subfield e for field 111  -->
472
                                <xsl:when test="@tag=111">abcdeqt</xsl:when>
472
                                <xsl:when test="@tag=111">abceqt</xsl:when>
473
                                <xsl:otherwise>abcdjqt</xsl:otherwise>
473
                                <xsl:otherwise>abcjqt</xsl:otherwise>
474
                            </xsl:choose>
474
                            </xsl:choose>
475
                        </xsl:with-param>
475
                        </xsl:with-param>
476
                    </xsl:call-template>
476
                    </xsl:call-template>
Lines 479-484 Link Here
479
                    <xsl:text>:,;/ </xsl:text>
479
                    <xsl:text>:,;/ </xsl:text>
480
                </xsl:with-param>
480
                </xsl:with-param>
481
            </xsl:call-template>
481
            </xsl:call-template>
482
            <xsl:if test="marc:subfield[@code='d']">
483
                <span class="authordates">
484
                    <xsl:text> </xsl:text>
485
                    <xsl:value-of select="marc:subfield[@code='d']"/>
486
                </span>
487
            </xsl:if>
482
            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
488
            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
483
                <span class="relatorcode">
489
                <span class="relatorcode">
484
                    <xsl:text> [</xsl:text>
490
                    <xsl:text> [</xsl:text>
485
- 

Return to bug 15100