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

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-24 / +60 lines)
Lines 1122-1128 Link Here
1122
        <xsl:for-each select="$authorfield">
1122
        <xsl:for-each select="$authorfield">
1123
        <xsl:choose>
1123
        <xsl:choose>
1124
          <xsl:when test="position()&gt;1"/>
1124
          <xsl:when test="position()&gt;1"/>
1125
          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
1125
          <!-- #13383 -->
1126
          <xsl:when test="@tag&lt;700">By: </xsl:when>
1126
          <!--#13382 Changed Additional author to contributor -->
1127
          <!--#13382 Changed Additional author to contributor -->
1127
          <xsl:otherwise>Contributor(s): </xsl:otherwise>
1128
          <xsl:otherwise>Contributor(s): </xsl:otherwise>
1128
        </xsl:choose>
1129
        </xsl:choose>
Lines 1136-1144 Link Here
1136
            </xsl:otherwise>
1137
            </xsl:otherwise>
1137
        </xsl:choose>
1138
        </xsl:choose>
1138
	<xsl:choose>
1139
	<xsl:choose>
1139
          <xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>
1140
	    <xsl:when test="@tag=100 or @tag=110 or @tag=111">
1140
          <xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>
1141
	        <!-- #13383 -->
1141
          <xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>
1142
	        <xsl:call-template name="chopPunctuation">
1143
	            <xsl:with-param name="chopString">
1144
	                <xsl:call-template name="subfieldSelect">
1145
	                    <xsl:with-param name="codes">
1146
	                        <xsl:choose>
1147
	                            <!-- #13383 include subfield e for field 111  -->
1148
	                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
1149
	                            <xsl:otherwise>abcdjqt</xsl:otherwise>
1150
	                        </xsl:choose>
1151
	                    </xsl:with-param>
1152
	                </xsl:call-template>
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>
1142
	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1159
	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1143
	    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1160
	    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1144
	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1161
	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
Lines 1159-1184 Link Here
1159
	</xsl:choose>
1176
	</xsl:choose>
1160
1177
1161
	<!-- add relator code too between brackets-->
1178
	<!-- add relator code too between brackets-->
1162
    <xsl:if test="marc:subfield[@code='4' or @code='e']">
1179
    <!-- #13383 include relator code j for field 111 -->
1163
      <span class="relatorcode">
1180
            <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'][. != ''])">
1164
      <xsl:text> [</xsl:text>
1181
                <span class="relatorcode">
1165
	  <xsl:choose>
1182
                    <xsl:text> [</xsl:text>
1166
	    <xsl:when test="marc:subfield[@code='e']">
1183
                    <xsl:choose>
1167
	        <xsl:for-each select="marc:subfield[@code='e']">
1184
                        <xsl:when test="@tag=111">
1168
	            <xsl:value-of select="."/>
1185
                            <xsl:choose>
1169
	            <xsl:if test="position() != last()">, </xsl:if>
1186
                                <!-- Prefer j over 4 -->
1170
	        </xsl:for-each>
1187
                                <xsl:when test="marc:subfield[@code='j']">
1171
	    </xsl:when>
1188
                                    <xsl:for-each select="marc:subfield[@code='j']">
1172
	    <xsl:otherwise>
1189
                                        <xsl:value-of select="."/>
1173
	        <xsl:for-each select="marc:subfield[@code=4]">
1190
                                        <xsl:if test="position() != last()">, </xsl:if>
1174
	            <xsl:value-of select="."/>
1191
                                    </xsl:for-each>
1175
	            <xsl:if test="position() != last()">, </xsl:if>
1192
                                </xsl:when>
1176
	        </xsl:for-each>
1193
                                <xsl:otherwise>
1177
	    </xsl:otherwise>
1194
                                    <xsl:for-each select="marc:subfield[@code=4]">
1178
	  </xsl:choose>
1195
                                        <xsl:value-of select="."/>
1179
	  <xsl:text>]</xsl:text>
1196
                                        <xsl:if test="position() != last()">, </xsl:if>
1180
      </span>
1197
                                    </xsl:for-each>
1181
	</xsl:if>
1198
                                </xsl:otherwise>
1199
                            </xsl:choose>
1200
                        </xsl:when>
1201
                        <!-- Prefer e over 4 -->
1202
                        <xsl:when test="marc:subfield[@code='e']">
1203
                            <xsl:for-each select="marc:subfield[@code='e']">
1204
                                <xsl:value-of select="."/>
1205
                                <xsl:if test="position() != last()">, </xsl:if>
1206
                            </xsl:for-each>
1207
                        </xsl:when>
1208
                        <xsl:otherwise>
1209
                            <xsl:for-each select="marc:subfield[@code=4]">
1210
                                <xsl:value-of select="."/>
1211
                                <xsl:if test="position() != last()">, </xsl:if>
1212
                            </xsl:for-each>
1213
                        </xsl:otherwise>
1214
                    </xsl:choose>
1215
                    <xsl:text>]</xsl:text>
1216
                </span>
1217
            </xsl:if>
1182
	</a>
1218
	</a>
1183
        <xsl:choose>
1219
        <xsl:choose>
1184
            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
1220
            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-51 / +77 lines)
Lines 339-395 Link Here
339
    <xsl:choose>
339
    <xsl:choose>
340
    <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]">
340
    <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]">
341
    <p class="author">by
341
    <p class="author">by
342
    <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700) and @ind1!='z']">
342
        <!-- #13383 -->
343
    <a>
343
        <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700 or @tag=110 or @tag=710 or @tag=111 or @tag=711) and @ind1!='z']">
344
    <xsl:choose>
344
            <xsl:if test="@tag=111 or @tag=711 and marc:subfield[@code='n']">
345
        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
345
                <xsl:text> </xsl:text>
346
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
346
                <xsl:call-template name="subfieldSelect">
347
        </xsl:when>
347
                    <xsl:with-param name="codes">n</xsl:with-param>
348
        <xsl:otherwise>
348
                </xsl:call-template>
349
        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
349
                <xsl:text> </xsl:text>
350
        </xsl:otherwise>
350
            </xsl:if>
351
    </xsl:choose>
351
            <a>
352
    <xsl:call-template name="nameABCQ"/></a>
352
                <xsl:choose>
353
    <xsl:choose>
353
                    <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
354
    <xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
354
                        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
355
    </xsl:for-each>
355
                    </xsl:when>
356
356
                    <xsl:otherwise>
357
    <xsl:for-each select="marc:datafield[(@tag=110 or @tag=710) and @ind1!='z']">
357
                        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
358
    <a>
358
                    </xsl:otherwise>
359
    <xsl:choose>
359
                </xsl:choose>
360
        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
360
                <xsl:call-template name="chopPunctuation">
361
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
361
                    <xsl:with-param name="chopString">
362
        </xsl:when>
362
                        <xsl:call-template name="subfieldSelect">
363
        <xsl:otherwise>
363
                            <xsl:with-param name="codes">
364
        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
364
                                <xsl:choose>
365
        </xsl:otherwise>
365
                                    <!-- #13383 include subfield e for field 111  -->
366
    </xsl:choose>
366
                                    <xsl:when test="@tag=111">abcdeqt</xsl:when>
367
    <xsl:call-template name="nameABCDN"/></a>
367
                                    <xsl:otherwise>abcdjqt</xsl:otherwise>
368
    <xsl:choose><xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
368
                                </xsl:choose>
369
    </xsl:for-each>
369
                            </xsl:with-param>
370
370
                        </xsl:call-template>
371
    <xsl:for-each select="marc:datafield[(@tag=111 or @tag=711) and @ind1!='z']">
371
                    </xsl:with-param>
372
        <xsl:choose>
372
                    <xsl:with-param name="punctuation">
373
        <xsl:when test="marc:subfield[@code='n']">
373
                        <xsl:text>:,;/ </xsl:text>
374
           <xsl:text> </xsl:text>
374
                    </xsl:with-param>
375
           <xsl:call-template name="subfieldSelect">
375
                </xsl:call-template>
376
              <xsl:with-param name="codes">n</xsl:with-param>                              </xsl:call-template>
376
            </a>
377
           <xsl:text> </xsl:text>
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'][. != ''])">
378
        </xsl:when>
378
                <span class="relatorcode">
379
        </xsl:choose>
379
                    <xsl:text> [</xsl:text>
380
    <a>
380
                    <xsl:choose>
381
    <xsl:choose>
381
                        <xsl:when test="@tag=111">
382
        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
382
                            <xsl:choose>
383
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
383
                                <!-- Prefer j over 4 -->
384
        </xsl:when>
384
                                <xsl:when test="marc:subfield[@code='j']">
385
        <xsl:otherwise>
385
                                    <xsl:for-each select="marc:subfield[@code='j']">
386
        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
386
                                        <xsl:value-of select="."/>
387
        </xsl:otherwise>
387
                                        <xsl:if test="position() != last()">, </xsl:if>
388
    </xsl:choose>
388
                                    </xsl:for-each>
389
    <xsl:call-template name="nameACDEQ"/></a>
389
                                </xsl:when>
390
    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
390
                                <xsl:otherwise>
391
391
                                    <xsl:for-each select="marc:subfield[@code=4]">
392
    </xsl:for-each>
392
                                        <xsl:value-of select="."/>
393
                                        <xsl:if test="position() != last()">, </xsl:if>
394
                                    </xsl:for-each>
395
                                </xsl:otherwise>
396
                            </xsl:choose>
397
                        </xsl:when>
398
                        <!-- Prefer e over 4 -->
399
                        <xsl:when test="marc:subfield[@code='e']">
400
                            <xsl:for-each select="marc:subfield[@code='e']">
401
                                <xsl:value-of select="."/>
402
                                <xsl:if test="position() != last()">, </xsl:if>
403
                            </xsl:for-each>
404
                        </xsl:when>
405
                        <xsl:otherwise>
406
                            <xsl:for-each select="marc:subfield[@code=4]">
407
                                <xsl:value-of select="."/>
408
                                <xsl:if test="position() != last()">, </xsl:if>
409
                            </xsl:for-each>
410
                        </xsl:otherwise>
411
                    </xsl:choose>
412
                    <xsl:text>]</xsl:text>
413
                </span>
414
            </xsl:if>
415
            <xsl:choose>
416
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
417
            </xsl:choose>
418
        </xsl:for-each>
393
    </p>
419
    </p>
394
    </xsl:when>
420
    </xsl:when>
395
    </xsl:choose>
421
    </xsl:choose>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-10 / +45 lines)
Lines 1188-1194 Link Here
1188
            <xsl:for-each select="$authorfield">
1188
            <xsl:for-each select="$authorfield">
1189
                <xsl:choose>
1189
                <xsl:choose>
1190
                    <xsl:when test="position()&gt;1"/>
1190
                    <xsl:when test="position()&gt;1"/>
1191
                    <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
1191
                    <!-- #13383 -->
1192
                    <xsl:when test="@tag&lt;700">By: </xsl:when>
1192
                    <!--#13382 Changed Additional author to contributor -->
1193
                    <!--#13382 Changed Additional author to contributor -->
1193
                    <xsl:otherwise>Contributor(s): </xsl:otherwise>
1194
                    <xsl:otherwise>Contributor(s): </xsl:otherwise>
1194
                </xsl:choose>
1195
                </xsl:choose>
Lines 1232-1240 Link Here
1232
                    </xsl:choose>
1233
                    </xsl:choose>
1233
                <span property="name">
1234
                <span property="name">
1234
                <xsl:choose>
1235
                <xsl:choose>
1235
                    <xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>
1236
                    <xsl:when test="@tag=100 or @tag=110 or @tag=111">
1236
                    <xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>
1237
                        <!-- #13383 -->
1237
                    <xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>
1238
                        <xsl:call-template name="chopPunctuation">
1239
                            <xsl:with-param name="chopString">
1240
                                <xsl:call-template name="subfieldSelect">
1241
                                    <xsl:with-param name="codes">
1242
                                        <xsl:choose>
1243
                                            <!-- #13383 include subfield e for field 111  -->
1244
                                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
1245
                                            <xsl:otherwise>abcdjqt</xsl:otherwise>
1246
                                        </xsl:choose>
1247
                                    </xsl:with-param>
1248
                                </xsl:call-template>
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>
1238
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1255
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1239
                    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1256
                    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1240
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1257
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
Lines 1254-1264 Link Here
1254
                    </xsl:when>
1271
                    </xsl:when>
1255
                </xsl:choose>
1272
                </xsl:choose>
1256
                </span></span></span>
1273
                </span></span></span>
1257
                <!-- add relator code too between brackets-->
1274
                <!-- #13383 include relator code j for field 111 -->
1258
                <xsl:if test="marc:subfield[@code='4' or @code='e']">
1275
                <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'][. != ''])">
1259
                    <span class="relatorcode">
1276
                    <span class="relatorcode">
1260
                        <xsl:text> [</xsl:text>
1277
                        <xsl:text> [</xsl:text>
1261
                        <xsl:choose>
1278
                        <xsl:choose>
1279
                            <xsl:when test="@tag=111">
1280
                                <xsl:choose>
1281
                                    <!-- Prefer j over 4 -->
1282
                                    <xsl:when test="marc:subfield[@code='j']">
1283
                                        <xsl:for-each select="marc:subfield[@code='j']">
1284
                                            <xsl:value-of select="."/>
1285
                                            <xsl:if test="position() != last()">, </xsl:if>
1286
                                        </xsl:for-each>
1287
                                    </xsl:when>
1288
                                    <xsl:otherwise>
1289
                                        <xsl:for-each select="marc:subfield[@code=4]">
1290
                                            <xsl:value-of select="."/>
1291
                                            <xsl:if test="position() != last()">, </xsl:if>
1292
                                        </xsl:for-each>
1293
                                    </xsl:otherwise>
1294
                                </xsl:choose>
1295
                            </xsl:when>
1296
                            <!-- Prefer e over 4 -->
1262
                            <xsl:when test="marc:subfield[@code='e']">
1297
                            <xsl:when test="marc:subfield[@code='e']">
1263
                                <xsl:for-each select="marc:subfield[@code='e']">
1298
                                <xsl:for-each select="marc:subfield[@code='e']">
1264
                                    <xsl:value-of select="."/>
1299
                                    <xsl:value-of select="."/>
Lines 1287-1296 Link Here
1287
                    </xsl:element>
1322
                    </xsl:element>
1288
                </a>
1323
                </a>
1289
            </xsl:if>
1324
            </xsl:if>
1290
        </xsl:for-each>
1325
                <xsl:choose>
1291
            <xsl:choose>
1326
                    <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
1292
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
1327
                </xsl:choose>
1293
            </xsl:choose>
1328
            </xsl:for-each>
1294
        </h5>
1329
        </h5>
1295
        </xsl:if>
1330
        </xsl:if>
1296
    </xsl:template>
1331
    </xsl:template>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-48 / +64 lines)
Lines 454-510 Link Here
454
    <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]">
454
    <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]">
455
455
456
    by <span class="author">
456
    by <span class="author">
457
        <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700) and @ind1!='z']">
457
        <!-- #13383 -->
458
            <xsl:choose>
458
        <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700 or @tag=110 or @tag=710 or @tag=111 or @tag=711) and @ind1!='z']">
459
            <xsl:when test="position()=last()">
459
            <xsl:if test="@tag=111 or @tag=711 and marc:subfield[@code='n']">
460
                <xsl:call-template name="nameABCQ"/>.
460
                <xsl:text> </xsl:text>
461
            </xsl:when>
461
                <xsl:call-template name="subfieldSelect">
462
            <xsl:otherwise>
462
                    <xsl:with-param name="codes">n</xsl:with-param>
463
                <xsl:call-template name="nameABCQ"/>;
463
                </xsl:call-template>
464
            </xsl:otherwise>
464
                <xsl:text> </xsl:text>
465
            </xsl:choose>
465
            </xsl:if>
466
        </xsl:for-each>
466
            <xsl:call-template name="chopPunctuation">
467
467
                <xsl:with-param name="chopString">
468
        <xsl:for-each select="marc:datafield[(@tag=110 or @tag=710) and @ind1!='z']">
468
                    <xsl:call-template name="subfieldSelect">
469
            <xsl:choose>
469
                        <xsl:with-param name="codes">
470
            <xsl:when test="position()=1">
470
                            <xsl:choose>
471
		<xsl:text> -- </xsl:text>
471
                                <!-- #13383 include subfield e for field 111  -->
472
            </xsl:when>
472
                                <xsl:when test="@tag=111">abcdeqt</xsl:when>
473
            </xsl:choose>
473
                                <xsl:otherwise>abcdjqt</xsl:otherwise>
474
                            </xsl:choose>
475
                        </xsl:with-param>
476
                    </xsl:call-template>
477
                </xsl:with-param>
478
                <xsl:with-param name="punctuation">
479
                    <xsl:text>:,;/ </xsl:text>
480
                </xsl:with-param>
481
            </xsl:call-template>
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'][. != ''])">
483
                <span class="relatorcode">
484
                    <xsl:text> [</xsl:text>
485
                    <xsl:choose>
486
                        <xsl:when test="@tag=111">
487
                            <xsl:choose>
488
                                <!-- Prefer j over 4 -->
489
                                <xsl:when test="marc:subfield[@code='j']">
490
                                    <xsl:for-each select="marc:subfield[@code='j']">
491
                                        <xsl:value-of select="."/>
492
                                        <xsl:if test="position() != last()">, </xsl:if>
493
                                    </xsl:for-each>
494
                                </xsl:when>
495
                                <xsl:otherwise>
496
                                    <xsl:for-each select="marc:subfield[@code=4]">
497
                                        <xsl:value-of select="."/>
498
                                        <xsl:if test="position() != last()">, </xsl:if>
499
                                    </xsl:for-each>
500
                                </xsl:otherwise>
501
                            </xsl:choose>
502
                        </xsl:when>
503
                        <!-- Prefer e over 4 -->
504
                        <xsl:when test="marc:subfield[@code='e']">
505
                            <xsl:for-each select="marc:subfield[@code='e']">
506
                                <xsl:value-of select="."/>
507
                                <xsl:if test="position() != last()">, </xsl:if>
508
                            </xsl:for-each>
509
                        </xsl:when>
510
                        <xsl:otherwise>
511
                            <xsl:for-each select="marc:subfield[@code=4]">
512
                                <xsl:value-of select="."/>
513
                                <xsl:if test="position() != last()">, </xsl:if>
514
                            </xsl:for-each>
515
                        </xsl:otherwise>
516
                    </xsl:choose>
517
                    <xsl:text>]</xsl:text>
518
                </span>
519
            </xsl:if>
474
            <xsl:choose>
520
            <xsl:choose>
475
            <xsl:when test="position()=last()">
521
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
476
                <xsl:call-template name="nameABCDN"/>
477
            </xsl:when>
478
            <xsl:otherwise>
479
                <xsl:call-template name="nameABCDN"/>;
480
            </xsl:otherwise>
481
            </xsl:choose>
522
            </xsl:choose>
482
        </xsl:for-each>
523
        </xsl:for-each>
483
524
484
        <xsl:for-each select="marc:datafield[(@tag=111 or @tag=711) and @ind1!='z']">
485
            <xsl:choose>
486
            <xsl:when test="position()=1">
487
		<xsl:text> -- </xsl:text>
488
            </xsl:when>
489
            </xsl:choose>
490
            <xsl:choose>
491
            <xsl:when test="marc:subfield[@code='n']">
492
               <xsl:text> </xsl:text>
493
               <xsl:call-template name="subfieldSelect">
494
                  <xsl:with-param name="codes">n</xsl:with-param>
495
               </xsl:call-template>
496
               <xsl:text> </xsl:text>
497
            </xsl:when>
498
            </xsl:choose>
499
            <xsl:choose>
500
            <xsl:when test="position()=last()">
501
                <xsl:call-template name="nameACDEQ"/>.
502
            </xsl:when>
503
            <xsl:otherwise>
504
                <xsl:call-template name="nameACDEQ"/>;
505
            </xsl:otherwise>
506
            </xsl:choose>
507
        </xsl:for-each>
508
    </span>
525
    </span>
509
    </xsl:when>
526
    </xsl:when>
510
    </xsl:choose>
527
    </xsl:choose>
511
- 

Return to bug 13383