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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-20 / +57 lines)
Lines 1295-1301 Link Here
1295
                                    <xsl:with-param name="codes">
1295
                                    <xsl:with-param name="codes">
1296
                                        <xsl:choose>
1296
                                        <xsl:choose>
1297
                                            <!-- #13383 include subfield e for field 111  -->
1297
                                            <!-- #13383 include subfield e for field 111  -->
1298
                                            <xsl:when test="@tag=111">abceqt</xsl:when>
1298
                                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
1299
                                            <xsl:otherwise>abcjqt</xsl:otherwise>
1299
                                            <xsl:otherwise>abcjqt</xsl:otherwise>
1300
                                        </xsl:choose>
1300
                                        </xsl:choose>
1301
                                    </xsl:with-param>
1301
                                    </xsl:with-param>
Lines 1309-1344 Link Here
1309
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1309
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1310
                    <!--#13382 Added all relevant subfields 4, e, and d are handled separately -->
1310
                    <!--#13382 Added all relevant subfields 4, e, and d are handled separately -->
1311
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1311
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1312
                        <xsl:variable name="str">
1312
                    <!-- Includes major changes for 7XX fields -->
1313
            <xsl:if test="@tag=710 or @tag=711">
1314
            <xsl:call-template name="chopPunctuation">
1315
                <xsl:with-param name="chopString">
1316
                    <xsl:call-template name="subfieldSelect">
1317
                        <xsl:with-param name="codes">
1318
                            <xsl:choose>
1319
                                <xsl:when test="@tag=711">acdent</xsl:when>
1320
                                <xsl:otherwise>abcdnt</xsl:otherwise>
1321
                            </xsl:choose>
1322
                        </xsl:with-param>
1323
                    </xsl:call-template>
1324
                </xsl:with-param>
1325
                <xsl:with-param name="punctuation">
1326
                    <xsl:text>:,;/ </xsl:text>
1327
                </xsl:with-param>
1328
            </xsl:call-template>
1329
            </xsl:if>
1330
                        <!-- Display only name portion in 700 field -->
1331
                        <xsl:if test="@tag=700">
1332
                           <xsl:call-template name="chopPunctuation">
1333
                               <xsl:with-param name="chopString">
1334
                               <xsl:call-template name="subfieldSelect">
1335
                                  <xsl:with-param name="codes">abcq</xsl:with-param>
1336
                               </xsl:call-template>
1337
                               </xsl:with-param>
1338
                        </xsl:call-template>
1339
                        </xsl:if>
1340
                        <!-- Display class "authordates" in 700 field -->
1341
                        <xsl:if test="@tag=700 and marc:subfield[@code='d']">
1342
                        <span class="authordates">
1343
                        <xsl:text>, </xsl:text>
1344
                        <xsl:call-template name="chopPunctuation">
1345
                            <xsl:with-param name="chopString">
1313
                            <xsl:call-template name="subfieldSelect">
1346
                            <xsl:call-template name="subfieldSelect">
1314
                                <xsl:with-param name="codes">abcfghiklmnoprstux</xsl:with-param>
1347
                               <xsl:with-param name="codes">d</xsl:with-param>
1315
                            </xsl:call-template>
1348
                            </xsl:call-template>
1316
                        </xsl:variable>
1349
                            </xsl:with-param>
1350
                        </xsl:call-template>
1351
                        </span>
1352
                        </xsl:if>
1353
                        <!-- Display class "titleportion" in 700 field -->
1354
                        <xsl:if test="@tag=700">
1355
                        <span class="titleportion">
1356
                        <xsl:text>. </xsl:text>
1317
                        <xsl:call-template name="chopPunctuation">
1357
                        <xsl:call-template name="chopPunctuation">
1318
                            <xsl:with-param name="chopString">
1358
                            <xsl:with-param name="chopString">
1319
                                <xsl:value-of select="$str"/>
1359
                            <xsl:call-template name="subfieldSelect">
1320
                            </xsl:with-param>
1360
                                <xsl:with-param name="codes">fghjklmnoprstux</xsl:with-param>
1321
                            <xsl:with-param name="punctuation">
1361
                            </xsl:call-template>
1322
                                <xsl:text>:,;/. </xsl:text>
1323
                            </xsl:with-param>
1362
                            </xsl:with-param>
1324
                        </xsl:call-template>
1363
                        </xsl:call-template>
1364
                        </span>
1365
                        </xsl:if>
1366
1325
                    </xsl:when>
1367
                    </xsl:when>
1326
                </xsl:choose>
1368
                </xsl:choose>
1327
                </span></span></span>
1369
                </span></span></span>
1328
                <xsl:if test="marc:subfield[@code='d']">
1370
1329
                    <span class="authordates">
1371
                <!-- #13383 include relator code j for field 111 also include 711$e 'Subordinate unit' -->
1330
                        <xsl:text> </xsl:text>
1331
                        <xsl:value-of select="marc:subfield[@code='d']"/>
1332
                    </span>
1333
                </xsl:if>
1334
                <!-- #13383 include relator code j for field 111 -->
1335
                <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'][. != ''])">
1372
                <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'][. != ''])">
1373
1336
                    <span class="relatorcode">
1374
                    <span class="relatorcode">
1337
                        <xsl:text> [</xsl:text>
1375
                        <xsl:text> [</xsl:text>
1338
                        <xsl:choose>
1376
                        <xsl:choose>
1339
                            <xsl:when test="@tag=111">
1377
                            <xsl:when test="@tag=111 or @tag=711">
1340
                                <xsl:choose>
1378
                                <xsl:choose>
1341
                                    <!-- Prefer j over 4 -->
1379
                                    <!-- Prefer j over 4 for 111 and 711 -->
1342
                                    <xsl:when test="marc:subfield[@code='j']">
1380
                                    <xsl:when test="marc:subfield[@code='j']">
1343
                                        <xsl:for-each select="marc:subfield[@code='j']">
1381
                                        <xsl:for-each select="marc:subfield[@code='j']">
1344
                                            <xsl:value-of select="."/>
1382
                                            <xsl:value-of select="."/>
Lines 1353-1360 Link Here
1353
                                    </xsl:otherwise>
1391
                                    </xsl:otherwise>
1354
                                </xsl:choose>
1392
                                </xsl:choose>
1355
                            </xsl:when>
1393
                            </xsl:when>
1356
                            <!-- Prefer e over 4 -->
1394
                            <!-- Prefer e over 4 on 100 and 110-->
1357
                            <xsl:when test="marc:subfield[@code='e']">
1395
                            <xsl:when test="marc:subfield[@code='e'][not(@tag=111) or not(@tag=711)]">
1358
                                <xsl:for-each select="marc:subfield[@code='e']">
1396
                                <xsl:for-each select="marc:subfield[@code='e']">
1359
                                    <xsl:value-of select="."/>
1397
                                    <xsl:value-of select="."/>
1360
                                    <xsl:if test="position() != last()">, </xsl:if>
1398
                                    <xsl:if test="position() != last()">, </xsl:if>
1361
- 

Return to bug 16343