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

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-12 / +18 lines)
Lines 997-1015 Link Here
997
                </xsl:with-param>                
997
                </xsl:with-param>                
998
            </xsl:call-template>
998
            </xsl:call-template>
999
999
1000
    	<!-- add relator code too between brackets-->
1001
            <!-- #13383 include relator code j for field 111 -->
1000
            <!-- #13383 include relator code j for field 111 -->
1002
        	<xsl:if test="marc:subfield[@code='4' or @code='e' or @code='j']">
1001
            <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'][. != ''])">
1003
              <span class="relatorcode">
1002
                <span class="relatorcode">
1004
              <xsl:text> [</xsl:text>
1003
                    <xsl:text> [</xsl:text>
1005
        	  <xsl:choose>
1004
                    <xsl:choose>
1006
        	      <xsl:when test="@tag=111"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
1005
                        <xsl:when test="@tag=111">
1007
        	      <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
1006
                            <xsl:choose>
1008
        	      <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
1007
                                <!-- Prefer j over 4 -->
1009
        	  </xsl:choose>
1008
                                <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
1010
        	  <xsl:text>]</xsl:text>
1009
                                <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
1011
              </span>
1010
                            </xsl:choose>
1012
        	</xsl:if>
1011
                        </xsl:when>
1012
                        <!-- Prefer e over 4 -->
1013
                        <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
1014
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
1015
                    </xsl:choose>
1016
                    <xsl:text>]</xsl:text>
1017
                </span>
1018
            </xsl:if>
1013
	       </a>
1019
	       </a>
1014
        <xsl:choose>
1020
        <xsl:choose>
1015
            <!-- #13383 added separator with span -->
1021
            <!-- #13383 added separator with span -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-6 / +13 lines)
Lines 364-371 Link Here
364
            <span class="relatorcode">
364
            <span class="relatorcode">
365
                <xsl:text> [</xsl:text>
365
                <xsl:text> [</xsl:text>
366
                <xsl:choose>
366
                <xsl:choose>
367
                    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
367
                    <!-- Prefer e over 4 -->
368
                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
368
                    <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
369
                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
369
                </xsl:choose>
370
                </xsl:choose>
370
                <xsl:text>]</xsl:text>
371
                <xsl:text>]</xsl:text>
371
            </span>
372
            </span>
Lines 400-407 Link Here
400
            <span class="relatorcode">
401
            <span class="relatorcode">
401
                <xsl:text> [</xsl:text>
402
                <xsl:text> [</xsl:text>
402
                <xsl:choose>
403
                <xsl:choose>
403
                    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
404
                    <!-- Prefer e over 4 -->
404
                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
405
                    <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
406
                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
405
                </xsl:choose>
407
                </xsl:choose>
406
                <xsl:text>]</xsl:text>
408
                <xsl:text>]</xsl:text>
407
            </span>
409
            </span>
Lines 441-449 Link Here
441
                <xsl:text>:,;/ </xsl:text>
443
                <xsl:text>:,;/ </xsl:text>
442
            </xsl:with-param>                
444
            </xsl:with-param>                
443
        </xsl:call-template></a>
445
        </xsl:call-template></a>
444
        <xsl:if test="marc:subfield[@code='j']">
446
        <xsl:if test="marc:subfield[@code='4' or @code='j'][. != '']">
445
            <span class="relatorcode">
447
            <span class="relatorcode">
446
                <xsl:text> [</xsl:text><xsl:value-of select="marc:subfield[@code='j']"/>
448
                <xsl:text> [</xsl:text>
449
                <xsl:choose>
450
                    <!-- Prefer j over 4 -->
451
                    <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
452
                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
453
                </xsl:choose>
447
                <xsl:text>]</xsl:text>
454
                <xsl:text>]</xsl:text>
448
            </span>
455
            </span>
449
        </xsl:if>
456
        </xsl:if>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-8 / +15 lines)
Lines 1105-1119 Link Here
1105
                    </xsl:call-template>
1105
                    </xsl:call-template>
1106
                </span></span></span>
1106
                </span></span></span>
1107
                <!-- #13383 include relator code j for field 111 -->
1107
                <!-- #13383 include relator code j for field 111 -->
1108
                <xsl:if test="marc:subfield[@code='4' or @code='e' or @code='j']">
1108
                <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'][. != ''])">
1109
                    <span class="relatorcode">
1109
                    <span class="relatorcode">
1110
                    <xsl:text> [</xsl:text>
1110
                        <xsl:text> [</xsl:text>
1111
                    <xsl:choose>
1111
                        <xsl:choose>
1112
                        <xsl:when test="@tag=111"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
1112
                            <xsl:when test="@tag=111">
1113
                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
1113
                                <xsl:choose>
1114
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
1114
                                    <!-- Prefer j over 4 -->
1115
                    </xsl:choose>
1115
                                    <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
1116
                    <xsl:text>]</xsl:text>
1116
                                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
1117
                                </xsl:choose>
1118
                            </xsl:when>
1119
                            <!-- Prefer e over 4 -->
1120
                            <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
1121
                            <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
1122
                        </xsl:choose>
1123
                        <xsl:text>]</xsl:text>
1117
                    </span>
1124
                    </span>
1118
                </xsl:if>
1125
                </xsl:if>
1119
            </a>
1126
            </a>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-7 / +13 lines)
Lines 469-476 Link Here
469
                <span class="relatorcode">
469
                <span class="relatorcode">
470
                    <xsl:text> [</xsl:text>
470
                    <xsl:text> [</xsl:text>
471
                    <xsl:choose>
471
                    <xsl:choose>
472
                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
472
                        <!-- Prefer e over 4 -->
473
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
473
                        <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
474
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
474
                    </xsl:choose>
475
                    </xsl:choose>
475
                    <xsl:text>]</xsl:text>
476
                    <xsl:text>]</xsl:text>
476
                </span>
477
                </span>
Lines 501-508 Link Here
501
                <span class="relatorcode">
502
                <span class="relatorcode">
502
                    <xsl:text> [</xsl:text>
503
                    <xsl:text> [</xsl:text>
503
                    <xsl:choose>
504
                    <xsl:choose>
504
                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
505
                        <!-- Prefer e over 4 -->
505
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
506
                        <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
507
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
506
                    </xsl:choose>
508
                    </xsl:choose>
507
                    <xsl:text>]</xsl:text>
509
                    <xsl:text>]</xsl:text>
508
                </span>
510
                </span>
Lines 527-535 Link Here
527
                    <xsl:text>:,;/ </xsl:text>
529
                    <xsl:text>:,;/ </xsl:text>
528
                </xsl:with-param>                
530
                </xsl:with-param>                
529
            </xsl:call-template>
531
            </xsl:call-template>
530
            <xsl:if test="marc:subfield[@code='j']">
532
            <xsl:if test="marc:subfield[@code='4' or @code='j'][. != '']">
531
                <span class="relatorcode">
533
                <span class="relatorcode">
532
                    <xsl:text> [</xsl:text><xsl:value-of select="marc:subfield[@code='j']"/>
534
                    <xsl:text> [</xsl:text>
535
                    <xsl:choose>
536
                        <!-- Prefer j over 4 -->
537
                        <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
538
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
539
                    </xsl:choose>
533
                    <xsl:text>]</xsl:text>
540
                    <xsl:text>]</xsl:text>
534
                </span>
541
                </span>
535
            </xsl:if>
542
            </xsl:if>
536
- 

Return to bug 13383