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

Return to bug 13382