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

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-11 / +134 lines)
Lines 143-150 Link Here
143
        </xsl:if>
143
        </xsl:if>
144
144
145
        <!-- Author Statement -->
145
        <!-- Author Statement -->
146
        <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template>
146
        <xsl:call-template name="showAuthor">
147
        <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template>
147
            <xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/>
148
            <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
149
        </xsl:call-template>
150
151
        <!-- #13382 Suppress 700$i and 7xx/@ind2=2 -->
152
        <xsl:call-template name="showAuthor">
153
            <xsl:with-param name="authorfield" select="marc:datafield[(@tag=700 or @tag=710 or @tag=711) and not(@ind2=2) and not(marc:subfield[@code='i'])]"/>
154
            <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
155
        </xsl:call-template>
148
156
149
    <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
157
    <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
150
        <span class="results_summary type"><span class="label">Material type: </span>
158
        <span class="results_summary type"><span class="label">Material type: </span>
Lines 529-534 Link Here
529
        </span>
537
        </span>
530
        </xsl:if>
538
        </xsl:if>
531
539
540
        <!-- #13382 Added Related works 700$i -->
541
        <xsl:if test="marc:datafield[@tag=700][marc:subfield[@code='i']] or marc:datafield[@tag=710][marc:subfield[@code='i']] or marc:datafield[@tag=711][marc:subfield[@code='i']]">
542
            <span class="results_summary related_works"><span class="label">Related Works: </span>
543
                <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='i']] | marc:datafield[@tag=710][marc:subfield[@code='i']] | marc:datafield[@tag=711][marc:subfield[@code='i']]">
544
                    <xsl:variable name="str">
545
                        <xsl:call-template name="subfieldSelect">
546
                            <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
547
                        </xsl:call-template>
548
                    </xsl:variable>
549
                    <xsl:call-template name="chopPunctuation">
550
                        <xsl:with-param name="chopString">
551
                            <xsl:value-of select="$str"/>
552
                        </xsl:with-param>
553
                    </xsl:call-template>
554
                    <!-- add relator code too between brackets-->
555
                    <xsl:if test="marc:subfield[@code='4' or @code='e']">
556
                        <span class="relatorcode">
557
                            <xsl:text> [</xsl:text>
558
                            <xsl:choose>
559
                                <xsl:when test="marc:subfield[@code='e']">
560
                                    <xsl:for-each select="marc:subfield[@code='e']">
561
                                        <xsl:value-of select="."/>
562
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
563
                                    </xsl:for-each>
564
                                </xsl:when>
565
                                <xsl:otherwise>
566
                                    <xsl:for-each select="marc:subfield[@code='4']">
567
                                        <xsl:value-of select="."/>
568
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
569
                                    </xsl:for-each>
570
                                </xsl:otherwise>
571
                            </xsl:choose>
572
                            <xsl:text>]</xsl:text>
573
                        </span>
574
                    </xsl:if>
575
                    <xsl:choose>
576
                        <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
577
                    </xsl:choose>
578
                </xsl:for-each>
579
            </span>
580
        </xsl:if>
581
582
        <!-- #13382 Added Contained Works 7xx@ind2=2 -->
583
        <xsl:if test="marc:datafield[@tag=700][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=710][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=711][@ind2=2 and not(marc:subfield[@code='i'])]">
584
            <span class="results_summary contained_works"><span class="label">Contained Works: </span>
585
                <xsl:for-each select="marc:datafield[@tag=700][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=710][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=711][@ind2=2][not(marc:subfield[@code='i'])]">
586
                    <xsl:variable name="str">
587
                        <xsl:call-template name="subfieldSelect">
588
                            <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
589
                        </xsl:call-template>
590
                    </xsl:variable>
591
                    <xsl:call-template name="chopPunctuation">
592
                        <xsl:with-param name="chopString">
593
                            <xsl:value-of select="$str"/>
594
                        </xsl:with-param>
595
                    </xsl:call-template>
596
                    <!-- add relator code too between brackets-->
597
                    <xsl:if test="marc:subfield[@code='4' or @code='e']">
598
                        <span class="relatorcode">
599
                            <xsl:text> [</xsl:text>
600
                            <xsl:choose>
601
                                <xsl:when test="marc:subfield[@code='e']">
602
                                    <xsl:for-each select="marc:subfield[@code='e']">
603
                                        <xsl:value-of select="."/>
604
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
605
                                    </xsl:for-each>
606
                                </xsl:when>
607
                                <xsl:otherwise>
608
                                    <xsl:for-each select="marc:subfield[@code='4']">
609
                                        <xsl:value-of select="."/>
610
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
611
                                    </xsl:for-each>
612
                                </xsl:otherwise>
613
                            </xsl:choose>
614
                            <xsl:text>]</xsl:text>
615
                        </span>
616
                    </xsl:if>
617
                    <xsl:choose>
618
                        <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
619
                    </xsl:choose>
620
                </xsl:for-each>
621
            </span>
622
        </xsl:if>
623
624
532
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
625
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
533
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
626
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
534
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
627
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
Lines 1027-1033 Link Here
1027
        <xsl:choose>
1120
        <xsl:choose>
1028
          <xsl:when test="position()&gt;1"/>
1121
          <xsl:when test="position()&gt;1"/>
1029
          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
1122
          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
1030
          <xsl:otherwise>Additional author(s): </xsl:otherwise>
1123
          <!--#13382 Changed Additional author to contributor -->
1124
          <xsl:otherwise>Contributor(s): </xsl:otherwise>
1031
        </xsl:choose>
1125
        </xsl:choose>
1032
        <a>
1126
        <a>
1033
        <xsl:choose>
1127
        <xsl:choose>
Lines 1039-1066 Link Here
1039
            </xsl:otherwise>
1133
            </xsl:otherwise>
1040
        </xsl:choose>
1134
        </xsl:choose>
1041
	<xsl:choose>
1135
	<xsl:choose>
1042
          <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when>
1136
          <xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>
1043
          <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
1137
          <xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>
1044
          <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
1138
          <xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>
1139
	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1140
	    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1141
	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1142
	        <xsl:variable name="str">
1143
	            <xsl:call-template name="subfieldSelect">
1144
	                <xsl:with-param name="codes">abcdfghiklmnoprstux</xsl:with-param>
1145
	            </xsl:call-template>
1146
	        </xsl:variable>
1147
	        <xsl:call-template name="chopPunctuation">
1148
	            <xsl:with-param name="chopString">
1149
	                <xsl:value-of select="$str"/>
1150
	            </xsl:with-param>
1151
	            <xsl:with-param name="punctuation">
1152
	                <xsl:text>:,;/. </xsl:text>
1153
	            </xsl:with-param>
1154
	        </xsl:call-template>
1155
	    </xsl:when>
1045
	</xsl:choose>
1156
	</xsl:choose>
1157
1046
	<!-- add relator code too between brackets-->
1158
	<!-- add relator code too between brackets-->
1047
	<xsl:if test="marc:subfield[@code='4' or @code='e']">
1159
    <xsl:if test="marc:subfield[@code='4' or @code='e']">
1048
      <span class="relatorcode">
1160
      <span class="relatorcode">
1049
      <xsl:text> [</xsl:text>
1161
      <xsl:text> [</xsl:text>
1050
	  <xsl:choose>
1162
	  <xsl:choose>
1051
	    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
1163
	    <xsl:when test="marc:subfield[@code='e']">
1052
	    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
1164
	        <xsl:for-each select="marc:subfield[@code='e']">
1165
	            <xsl:value-of select="."/>
1166
	            <xsl:if test="position() != last()">, </xsl:if>
1167
	        </xsl:for-each>
1168
	    </xsl:when>
1169
	    <xsl:otherwise>
1170
	        <xsl:for-each select="marc:subfield[@code=4]">
1171
	            <xsl:value-of select="."/>
1172
	            <xsl:if test="position() != last()">, </xsl:if>
1173
	        </xsl:for-each>
1174
	    </xsl:otherwise>
1053
	  </xsl:choose>
1175
	  </xsl:choose>
1054
	  <xsl:text>]</xsl:text>
1176
	  <xsl:text>]</xsl:text>
1055
      </span>
1177
      </span>
1056
	</xsl:if>
1178
	</xsl:if>
1057
	</a>
1179
	</a>
1058
        <xsl:choose>
1180
        <xsl:choose>
1059
          <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise>
1181
            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
1060
        </xsl:choose>
1182
        </xsl:choose>
1061
        </xsl:for-each>
1183
        </xsl:for-each>
1062
        </h5>
1184
        </h5>
1063
        </xsl:if>
1185
1186
	</xsl:if>
1064
    </xsl:template>
1187
    </xsl:template>
1065
1188
1066
</xsl:stylesheet>
1189
</xsl:stylesheet>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-26 / +150 lines)
Lines 162-179 Link Here
162
                </xsl:call-template>
162
                </xsl:call-template>
163
            </h5>
163
            </h5>
164
        </xsl:if>
164
        </xsl:if>
165
        <xsl:choose>
165
166
            <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
166
        <!--#13382 Added Author Statement to seperate Authors and Contributors -->
167
                <h5 class="author">by
167
        <xsl:call-template name="showAuthor">
168
                    <xsl:call-template name="showAuthor">
168
            <xsl:with-param name="authorfield" select="marc:datafield[(@tag=100 or @tag=110 or @tag=111)]"/>
169
                        <xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111 or @tag=700 or @tag=710 or @tag=711]"/>
169
            <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
170
                        <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
170
            <xsl:with-param name="materialTypeLabel" select="$materialTypeLabel"/>
171
                        <xsl:with-param name="materialTypeLabel" select="$materialTypeLabel"/>
171
            <xsl:with-param name="theme" select="$theme"/>
172
                        <xsl:with-param name="theme" select="$theme"/>
172
        </xsl:call-template>
173
                    </xsl:call-template>
173
174
                </h5>
174
        <xsl:call-template name="showAuthor">
175
            </xsl:when>
175
            <!-- #13382 suppress 700$i and 7xx/@ind2=2 -->
176
        </xsl:choose>
176
            <xsl:with-param name="authorfield" select="marc:datafield[(@tag=700 or @tag=710 or @tag=711) and not(@ind2=2) and not(marc:subfield[@code='i'])]"/>
177
            <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
178
        </xsl:call-template>
177
179
178
   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
180
   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
179
        <xsl:if test="$materialTypeCode!=''">
181
        <xsl:if test="$materialTypeCode!=''">
Lines 577-582 Link Here
577
        </span>
579
        </span>
578
        </xsl:if>
580
        </xsl:if>
579
581
582
583
            <!-- #13382 Added Related works 700$i -->
584
            <xsl:if test="marc:datafield[@tag=700][marc:subfield[@code='i']] or marc:datafield[@tag=710][marc:subfield[@code='i']] or marc:datafield[@tag=711][marc:subfield[@code='i']]">
585
                <span class="results_summary related_works"><span class="label">Related Works: </span>
586
                    <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='i']] | marc:datafield[@tag=710][marc:subfield[@code='i']] | marc:datafield[@tag=711][marc:subfield[@code='i']]">
587
                        <xsl:variable name="str">
588
                            <xsl:call-template name="subfieldSelect">
589
                                <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
590
                            </xsl:call-template>
591
                        </xsl:variable>
592
                        <xsl:call-template name="chopPunctuation">
593
                            <xsl:with-param name="chopString">
594
                                <xsl:value-of select="$str"/>
595
                            </xsl:with-param>
596
                        </xsl:call-template>
597
                        <!-- add relator code too between brackets-->
598
                        <xsl:if test="marc:subfield[@code='4' or @code='e']">
599
                            <span class="relatorcode">
600
                                <xsl:text> [</xsl:text>
601
                                <xsl:choose>
602
                                    <xsl:when test="marc:subfield[@code='e']">
603
                                        <xsl:for-each select="marc:subfield[@code='e']">
604
                                            <xsl:value-of select="."/>
605
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
606
                                        </xsl:for-each>
607
                                    </xsl:when>
608
                                    <xsl:otherwise>
609
                                        <xsl:for-each select="marc:subfield[@code='4']">
610
                                            <xsl:value-of select="."/>
611
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
612
                                        </xsl:for-each>
613
                                    </xsl:otherwise>
614
                                </xsl:choose>
615
                                <xsl:text>]</xsl:text>
616
                            </span>
617
                        </xsl:if>
618
                        <xsl:choose>
619
                            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
620
                        </xsl:choose>
621
                    </xsl:for-each>
622
                </span>
623
            </xsl:if>
624
625
            <!-- #13382 Added Contained Works 7xx@ind2=2 -->
626
            <xsl:if test="marc:datafield[@tag=700][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=710][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=711][@ind2=2 and not(marc:subfield[@code='i'])]">
627
                <span class="results_summary contained_works"><span class="label">Contained Works: </span>
628
                    <xsl:for-each select="marc:datafield[@tag=700][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=710][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=711][@ind2=2][not(marc:subfield[@code='i'])]">
629
                        <xsl:variable name="str">
630
                            <xsl:call-template name="subfieldSelect">
631
                                <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
632
                            </xsl:call-template>
633
                        </xsl:variable>
634
                        <xsl:call-template name="chopPunctuation">
635
                            <xsl:with-param name="chopString">
636
                                <xsl:value-of select="$str"/>
637
                            </xsl:with-param>
638
                        </xsl:call-template>
639
                        <!-- add relator code too between brackets-->
640
                        <xsl:if test="marc:subfield[@code='4' or @code='e']">
641
                            <span class="relatorcode">
642
                                <xsl:text> [</xsl:text>
643
                                <xsl:choose>
644
                                    <xsl:when test="marc:subfield[@code='e']">
645
                                        <xsl:for-each select="marc:subfield[@code='e']">
646
                                            <xsl:value-of select="."/>
647
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
648
                                        </xsl:for-each>
649
                                    </xsl:when>
650
                                    <xsl:otherwise>
651
                                        <xsl:for-each select="marc:subfield[@code='4']">
652
                                            <xsl:value-of select="."/>
653
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
654
                                        </xsl:for-each>
655
                                    </xsl:otherwise>
656
                                </xsl:choose>
657
                                <xsl:text>]</xsl:text>
658
                            </span>
659
                        </xsl:if>
660
                        <xsl:choose>
661
                            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
662
                        </xsl:choose>
663
                    </xsl:for-each>
664
                </span>
665
            </xsl:if>
666
580
            <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
667
            <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
581
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
668
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
582
                <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
669
                <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
Lines 1093-1102 Link Here
1093
        <xsl:param name="UseAuthoritiesForTracings" />
1180
        <xsl:param name="UseAuthoritiesForTracings" />
1094
        <xsl:param name="materialTypeLabel" />
1181
        <xsl:param name="materialTypeLabel" />
1095
        <xsl:param name="theme" />
1182
        <xsl:param name="theme" />
1096
        <xsl:for-each select="$authorfield">
1183
        <xsl:if test="count($authorfield)&gt;0">
1097
            <xsl:choose><xsl:when test="position()!=1"><xsl:text>; </xsl:text></xsl:when></xsl:choose>
1184
        <h5 class="author">
1185
            <xsl:for-each select="$authorfield">
1186
                <xsl:choose>
1187
                    <xsl:when test="position()&gt;1"/>
1188
                    <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
1189
                    <!--#13382 Changed Additional author to contributor -->
1190
                    <xsl:otherwise>Contributor(s): </xsl:otherwise>
1191
                </xsl:choose>
1098
            <xsl:choose>
1192
            <xsl:choose>
1099
                <xsl:when test="not(@tag=111 or @tag=711)" />
1193
                <xsl:when test="not(@tag=111) or @tag=700 or @tag=710 or @tag=711"/>
1100
                <xsl:when test="marc:subfield[@code='n']">
1194
                <xsl:when test="marc:subfield[@code='n']">
1101
                    <xsl:text> </xsl:text>
1195
                    <xsl:text> </xsl:text>
1102
                    <xsl:call-template name="subfieldSelect">
1196
                    <xsl:call-template name="subfieldSelect">
Lines 1135-1154 Link Here
1135
                    </xsl:choose>
1229
                    </xsl:choose>
1136
                <span property="name">
1230
                <span property="name">
1137
                <xsl:choose>
1231
                <xsl:choose>
1138
                    <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when>
1232
                    <xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>
1139
                    <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
1233
                    <xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>
1140
                    <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
1234
                    <xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>
1235
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1236
                    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1237
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1238
                        <xsl:variable name="str">
1239
                            <xsl:call-template name="subfieldSelect">
1240
                                <xsl:with-param name="codes">abcdfghiklmnoprstux</xsl:with-param>
1241
                            </xsl:call-template>
1242
                        </xsl:variable>
1243
                        <xsl:call-template name="chopPunctuation">
1244
                            <xsl:with-param name="chopString">
1245
                                <xsl:value-of select="$str"/>
1246
                            </xsl:with-param>
1247
                            <xsl:with-param name="punctuation">
1248
                                <xsl:text>:,;/. </xsl:text>
1249
                            </xsl:with-param>
1250
                        </xsl:call-template>
1251
                    </xsl:when>
1141
                </xsl:choose>
1252
                </xsl:choose>
1142
                </span></span></span>
1253
                </span></span></span>
1143
                <!-- add relator code too between brackets-->
1254
                <!-- add relator code too between brackets-->
1144
                <xsl:if test="marc:subfield[@code='4' or @code='e']">
1255
                <xsl:if test="marc:subfield[@code='4' or @code='e']">
1145
                    <span class="relatorcode">
1256
                    <span class="relatorcode">
1146
                    <xsl:text> [</xsl:text>
1257
                        <xsl:text> [</xsl:text>
1147
                    <xsl:choose>
1258
                        <xsl:choose>
1148
                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
1259
                            <xsl:when test="marc:subfield[@code='e']">
1149
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
1260
                                <xsl:for-each select="marc:subfield[@code='e']">
1150
                    </xsl:choose>
1261
                                    <xsl:value-of select="."/>
1151
                    <xsl:text>]</xsl:text>
1262
                                    <xsl:if test="position() != last()">, </xsl:if>
1263
                                </xsl:for-each>
1264
                            </xsl:when>
1265
                            <xsl:otherwise>
1266
                                <xsl:for-each select="marc:subfield[@code=4]">
1267
                                    <xsl:value-of select="."/>
1268
                                    <xsl:if test="position() != last()">, </xsl:if>
1269
                                </xsl:for-each>
1270
                            </xsl:otherwise>
1271
                        </xsl:choose>
1272
                        <xsl:text>]</xsl:text>
1152
                    </span>
1273
                    </span>
1153
                </xsl:if>
1274
                </xsl:if>
1154
            </a>
1275
            </a>
Lines 1164-1170 Link Here
1164
                </a>
1285
                </a>
1165
            </xsl:if>
1286
            </xsl:if>
1166
        </xsl:for-each>
1287
        </xsl:for-each>
1167
        <xsl:text>.</xsl:text>
1288
            <xsl:choose>
1289
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
1290
            </xsl:choose>
1291
        </h5>
1292
        </xsl:if>
1168
    </xsl:template>
1293
    </xsl:template>
1169
1294
1170
    <xsl:template name="nameABCQ">
1295
    <xsl:template name="nameABCQ">
1171
- 

Return to bug 13382