Attachment #40940 for bug #13383

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




        <xsl:for-each select="$authorfield">
        <xsl:choose>
          <xsl:when test="position()&gt;1"/>
          <!-- #13383 -->
          <xsl:when test="@tag&lt;700">By: </xsl:when>
          <!--#13382 Changed Additional author to contributor -->
          <xsl:otherwise>Contributor(s): </xsl:otherwise>
        </xsl:choose>

            </xsl:otherwise>
        </xsl:choose>
	<xsl:choose>
	    <xsl:when test="@tag=100 or @tag=110 or @tag=111">
	        <!-- #13383 -->
	        <xsl:call-template name="chopPunctuation">
	            <xsl:with-param name="chopString">
	                <xsl:call-template name="subfieldSelect">
	                    <xsl:with-param name="codes">
	                        <xsl:choose>
	                            <!-- #13383 include subfield e for field 111  -->
	                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
	                            <xsl:otherwise>abcdjqt</xsl:otherwise>
	                        </xsl:choose>
	                    </xsl:with-param>
	                </xsl:call-template>
	            </xsl:with-param>
	            <xsl:with-param name="punctuation">
	                <xsl:text>:,;/ </xsl:text>
	            </xsl:with-param>
	        </xsl:call-template>
	    </xsl:when>
	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
	    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">

	</xsl:choose>

	<!-- add relator code too between brackets-->
    <!-- #13383 include relator code j for field 111 -->
            <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'][. != ''])">
                <span class="relatorcode">
                    <xsl:text> [</xsl:text>
                    <xsl:choose>
                        <xsl:when test="@tag=111">
                            <xsl:choose>
                                <!-- Prefer j over 4 -->
                                <xsl:when test="marc:subfield[@code='j']">
                                    <xsl:for-each select="marc:subfield[@code='j']">
                                        <xsl:value-of select="."/>
                                        <xsl:if test="position() != last()">, </xsl:if>
                                    </xsl:for-each>
                                </xsl:when>
                                <xsl:otherwise>
                                    <xsl:for-each select="marc:subfield[@code=4]">
                                        <xsl:value-of select="."/>
                                        <xsl:if test="position() != last()">, </xsl:if>
                                    </xsl:for-each>
                                </xsl:otherwise>
                            </xsl:choose>
                        </xsl:when>
                        <!-- Prefer e over 4 -->
                        <xsl:when test="marc:subfield[@code='e']">
                            <xsl:for-each select="marc:subfield[@code='e']">
                                <xsl:value-of select="."/>
                                <xsl:if test="position() != last()">, </xsl:if>
                            </xsl:for-each>
                        </xsl:when>
                        <xsl:otherwise>
                            <xsl:for-each select="marc:subfield[@code=4]">
                                <xsl:value-of select="."/>
                                <xsl:if test="position() != last()">, </xsl:if>
                            </xsl:for-each>
                        </xsl:otherwise>
                    </xsl:choose>
                    <xsl:text>]</xsl:text>
                </span>
            </xsl:if>
	</a>
        <xsl:choose>
            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>




    <xsl:choose>
    <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]">
    <p class="author">by
        <!-- #13383 -->
        <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']">
            <xsl:if test="@tag=111 or @tag=711 and marc:subfield[@code='n']">
                <xsl:text> </xsl:text>
                <xsl:call-template name="subfieldSelect">
                    <xsl:with-param name="codes">n</xsl:with-param>
                </xsl:call-template>
                <xsl:text> </xsl:text>
            </xsl:if>
            <a>
                <xsl:choose>
                    <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
                        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
                    </xsl:when>
                    <xsl:otherwise>
                        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
                    </xsl:otherwise>
                </xsl:choose>
                <xsl:call-template name="chopPunctuation">
                    <xsl:with-param name="chopString">
                        <xsl:call-template name="subfieldSelect">
                            <xsl:with-param name="codes">
                                <xsl:choose>
                                    <!-- #13383 include subfield e for field 111  -->
                                    <xsl:when test="@tag=111">abcdeqt</xsl:when>
                                    <xsl:otherwise>abcdjqt</xsl:otherwise>
                                </xsl:choose>
                            </xsl:with-param>
                        </xsl:call-template>
                    </xsl:with-param>
                    <xsl:with-param name="punctuation">
                        <xsl:text>:,;/ </xsl:text>
                    </xsl:with-param>
                </xsl:call-template>
            </a>
            <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'][. != ''])">
                <span class="relatorcode">
                    <xsl:text> [</xsl:text>
                    <xsl:choose>
                        <xsl:when test="@tag=111">
                            <xsl:choose>
                                <!-- Prefer j over 4 -->
                                <xsl:when test="marc:subfield[@code='j']">
                                    <xsl:for-each select="marc:subfield[@code='j']">
                                        <xsl:value-of select="."/>
                                        <xsl:if test="position() != last()">, </xsl:if>
                                    </xsl:for-each>
                                </xsl:when>
                                <xsl:otherwise>
                                    <xsl:for-each select="marc:subfield[@code=4]">
                                        <xsl:value-of select="."/>
                                        <xsl:if test="position() != last()">, </xsl:if>
                                    </xsl:for-each>
                                </xsl:otherwise>
                            </xsl:choose>
                        </xsl:when>
                        <!-- Prefer e over 4 -->
                        <xsl:when test="marc:subfield[@code='e']">
                            <xsl:for-each select="marc:subfield[@code='e']">
                                <xsl:value-of select="."/>
                                <xsl:if test="position() != last()">, </xsl:if>
                            </xsl:for-each>
                        </xsl:when>
                        <xsl:otherwise>
                            <xsl:for-each select="marc:subfield[@code=4]">
                                <xsl:value-of select="."/>
                                <xsl:if test="position() != last()">, </xsl:if>
                            </xsl:for-each>
                        </xsl:otherwise>
                    </xsl:choose>
                    <xsl:text>]</xsl:text>
                </span>
            </xsl:if>
            <xsl:choose>
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
            </xsl:choose>
        </xsl:for-each>
    </p>
    </xsl:when>
    </xsl:choose>




            <xsl:for-each select="$authorfield">
                <xsl:choose>
                    <xsl:when test="position()&gt;1"/>
                    <!-- #13383 -->
                    <xsl:when test="@tag&lt;700">By: </xsl:when>
                    <!--#13382 Changed Additional author to contributor -->
                    <xsl:otherwise>Contributor(s): </xsl:otherwise>
                </xsl:choose>

                    </xsl:choose>
                <span property="name">
                <xsl:choose>
                    <xsl:when test="@tag=100 or @tag=110 or @tag=111">
                        <!-- #13383 -->
                        <xsl:call-template name="chopPunctuation">
                            <xsl:with-param name="chopString">
                                <xsl:call-template name="subfieldSelect">
                                    <xsl:with-param name="codes">
                                        <xsl:choose>
                                            <!-- #13383 include subfield e for field 111  -->
                                            <xsl:when test="@tag=111">abcdeqt</xsl:when>
                                            <xsl:otherwise>abcdjqt</xsl:otherwise>
                                        </xsl:choose>
                                    </xsl:with-param>
                                </xsl:call-template>
                            </xsl:with-param>
                            <xsl:with-param name="punctuation">
                                <xsl:text>:,;/ </xsl:text>
                            </xsl:with-param>
                        </xsl:call-template>
                    </xsl:when>
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
                    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">

                    </xsl:when>
                </xsl:choose>
                </span></span></span>
                <!-- #13383 include relator code j for field 111 -->
                <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'][. != ''])">
                    <span class="relatorcode">
                        <xsl:text> [</xsl:text>
                        <xsl:choose>
                            <xsl:when test="@tag=111">
                                <xsl:choose>
                                    <!-- Prefer j over 4 -->
                                    <xsl:when test="marc:subfield[@code='j']">
                                        <xsl:for-each select="marc:subfield[@code='j']">
                                            <xsl:value-of select="."/>
                                            <xsl:if test="position() != last()">, </xsl:if>
                                        </xsl:for-each>
                                    </xsl:when>
                                    <xsl:otherwise>
                                        <xsl:for-each select="marc:subfield[@code=4]">
                                            <xsl:value-of select="."/>
                                            <xsl:if test="position() != last()">, </xsl:if>
                                        </xsl:for-each>
                                    </xsl:otherwise>
                                </xsl:choose>
                            </xsl:when>
                            <!-- Prefer e over 4 -->
                            <xsl:when test="marc:subfield[@code='e']">
                                <xsl:for-each select="marc:subfield[@code='e']">
                                    <xsl:value-of select="."/>

                    </xsl:element>
                </a>
            </xsl:if>
                <xsl:choose>
                    <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
                </xsl:choose>
            </xsl:for-each>
        </h5>
        </xsl:if>
    </xsl:template>




    <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]">

    by <span class="author">
        <!-- #13383 -->
        <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']">
            <xsl:if test="@tag=111 or @tag=711 and marc:subfield[@code='n']">
                <xsl:text> </xsl:text>
                <xsl:call-template name="subfieldSelect">
                    <xsl:with-param name="codes">n</xsl:with-param>
                </xsl:call-template>
                <xsl:text> </xsl:text>
            </xsl:if>
            <xsl:call-template name="chopPunctuation">
                <xsl:with-param name="chopString">
                    <xsl:call-template name="subfieldSelect">
                        <xsl:with-param name="codes">
                            <xsl:choose>
                                <!-- #13383 include subfield e for field 111  -->
                                <xsl:when test="@tag=111">abcdeqt</xsl:when>
                                <xsl:otherwise>abcdjqt</xsl:otherwise>
                            </xsl:choose>
                        </xsl:with-param>
                    </xsl:call-template>
                </xsl:with-param>
                <xsl:with-param name="punctuation">
                    <xsl:text>:,;/ </xsl:text>
                </xsl:with-param>
            </xsl:call-template>
            <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'][. != ''])">
                <span class="relatorcode">
                    <xsl:text> [</xsl:text>
                    <xsl:choose>
                        <xsl:when test="@tag=111">
                            <xsl:choose>
                                <!-- Prefer j over 4 -->
                                <xsl:when test="marc:subfield[@code='j']">
                                    <xsl:for-each select="marc:subfield[@code='j']">
                                        <xsl:value-of select="."/>
                                        <xsl:if test="position() != last()">, </xsl:if>
                                    </xsl:for-each>
                                </xsl:when>
                                <xsl:otherwise>
                                    <xsl:for-each select="marc:subfield[@code=4]">
                                        <xsl:value-of select="."/>
                                        <xsl:if test="position() != last()">, </xsl:if>
                                    </xsl:for-each>
                                </xsl:otherwise>
                            </xsl:choose>
                        </xsl:when>
                        <!-- Prefer e over 4 -->
                        <xsl:when test="marc:subfield[@code='e']">
                            <xsl:for-each select="marc:subfield[@code='e']">
                                <xsl:value-of select="."/>
                                <xsl:if test="position() != last()">, </xsl:if>
                            </xsl:for-each>
                        </xsl:when>
                        <xsl:otherwise>
                            <xsl:for-each select="marc:subfield[@code=4]">
                                <xsl:value-of select="."/>
                                <xsl:if test="position() != last()">, </xsl:if>
                            </xsl:for-each>
                        </xsl:otherwise>
                    </xsl:choose>
                    <xsl:text>]</xsl:text>
                </span>
            </xsl:if>
            <xsl:choose>
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
                <xsl:call-template name="nameABCDN"/>
            </xsl:when>
            <xsl:otherwise>
                <xsl:call-template name="nameABCDN"/>;
            </xsl:otherwise>
            </xsl:choose>
        </xsl:for-each>

        <xsl:for-each select="marc:datafield[(@tag=111 or @tag=711) and @ind1!='z']">
            <xsl:choose>
            <xsl:when test="position()=1">
		<xsl:text> -- </xsl:text>
            </xsl:when>
            </xsl:choose>
            <xsl:choose>
            <xsl:when test="marc:subfield[@code='n']">
               <xsl:text> </xsl:text>
               <xsl:call-template name="subfieldSelect">
                  <xsl:with-param name="codes">n</xsl:with-param>
               </xsl:call-template>
               <xsl:text> </xsl:text>
            </xsl:when>
            </xsl:choose>
            <xsl:choose>
            <xsl:when test="position()=last()">
                <xsl:call-template name="nameACDEQ"/>.
            </xsl:when>
            <xsl:otherwise>
                <xsl:call-template name="nameACDEQ"/>;
            </xsl:otherwise>
            </xsl:choose>
        </xsl:for-each>
    </span>
    </xsl:when>
    </xsl:choose>
- 

Return to bug 13383

Lines 1123-1129 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-24 / +60 lines)
1123	<xsl:for-each select="$authorfield">	1123	<xsl:for-each select="$authorfield">
1124	<xsl:choose>	1124	<xsl:choose>
1125	<xsl:when test="position()>1"/>	1125	<xsl:when test="position()>1"/>
1126	<xsl:when test="@tag<700">Author(s): </xsl:when>	1126	<!-- #13383 -->
		1127	<xsl:when test="@tag<700">By: </xsl:when>
1127	<!--#13382 Changed Additional author to contributor -->	1128	<!--#13382 Changed Additional author to contributor -->
1128	<xsl:otherwise>Contributor(s): </xsl:otherwise>	1129	<xsl:otherwise>Contributor(s): </xsl:otherwise>
1129	</xsl:choose>	1130	</xsl:choose>
Lines 1137-1145 Link Here
1137	</xsl:otherwise>	1138	</xsl:otherwise>
1138	</xsl:choose>	1139	</xsl:choose>
1139	<xsl:choose>	1140	<xsl:choose>
1140	<xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>	1141	<xsl:when test="@tag=100 or @tag=110 or @tag=111">
1141	<xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>	1142	<!-- #13383 -->
1142	<xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>	1143	<xsl:call-template name="chopPunctuation">
		1144	<xsl:with-param name="chopString">
		1145	<xsl:call-template name="subfieldSelect">
		1146	<xsl:with-param name="codes">
		1147	<xsl:choose>
		1148	<!-- #13383 include subfield e for field 111 -->
		1149	<xsl:when test="@tag=111">abcdeqt</xsl:when>
		1150	<xsl:otherwise>abcdjqt</xsl:otherwise>
		1151	</xsl:choose>
		1152	</xsl:with-param>
		1153	</xsl:call-template>
		1154	</xsl:with-param>
		1155	<xsl:with-param name="punctuation">
		1156	<xsl:text>:,;/ </xsl:text>
		1157	</xsl:with-param>
		1158	</xsl:call-template>
		1159	</xsl:when>
1143	<!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->	1160	<!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1144	<!--#13382 Added all relevant subfields 4, e, are handled separately -->	1161	<!--#13382 Added all relevant subfields 4, e, are handled separately -->
1145	<xsl:when test="@tag=700 or @tag=710 or @tag=711">	1162	<xsl:when test="@tag=700 or @tag=710 or @tag=711">
Lines 1160-1185 Link Here
1160	</xsl:choose>	1177	</xsl:choose>
1161		1178
1162	<!-- add relator code too between brackets-->	1179	<!-- add relator code too between brackets-->
1163	<xsl:if test="marc:subfield[@code='4' or @code='e']">	1180	<!-- #13383 include relator code j for field 111 -->
1164	<span class="relatorcode">	1181	<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'][. != ''])">
1165	<xsl:text> [</xsl:text>	1182	<span class="relatorcode">
1166	<xsl:choose>	1183	<xsl:text> [</xsl:text>
1167	<xsl:when test="marc:subfield[@code='e']">	1184	<xsl:choose>
1168	<xsl:for-each select="marc:subfield[@code='e']">	1185	<xsl:when test="@tag=111">
1169	<xsl:value-of select="."/>	1186	<xsl:choose>
1170	<xsl:if test="position() != last()">, </xsl:if>	1187	<!-- Prefer j over 4 -->
1171	</xsl:for-each>	1188	<xsl:when test="marc:subfield[@code='j']">
1172	</xsl:when>	1189	<xsl:for-each select="marc:subfield[@code='j']">
1173	<xsl:otherwise>	1190	<xsl:value-of select="."/>
1174	<xsl:for-each select="marc:subfield[@code=4]">	1191	<xsl:if test="position() != last()">, </xsl:if>
1175	<xsl:value-of select="."/>	1192	</xsl:for-each>
1176	<xsl:if test="position() != last()">, </xsl:if>	1193	</xsl:when>
1177	</xsl:for-each>	1194	<xsl:otherwise>
1178	</xsl:otherwise>	1195	<xsl:for-each select="marc:subfield[@code=4]">
1179	</xsl:choose>	1196	<xsl:value-of select="."/>
1180	<xsl:text>]</xsl:text>	1197	<xsl:if test="position() != last()">, </xsl:if>
1181	</span>	1198	</xsl:for-each>
1182	</xsl:if>	1199	</xsl:otherwise>
		1200	</xsl:choose>
		1201	</xsl:when>
		1202	<!-- Prefer e over 4 -->
		1203	<xsl:when test="marc:subfield[@code='e']">
		1204	<xsl:for-each select="marc:subfield[@code='e']">
		1205	<xsl:value-of select="."/>
		1206	<xsl:if test="position() != last()">, </xsl:if>
		1207	</xsl:for-each>
		1208	</xsl:when>
		1209	<xsl:otherwise>
		1210	<xsl:for-each select="marc:subfield[@code=4]">
		1211	<xsl:value-of select="."/>
		1212	<xsl:if test="position() != last()">, </xsl:if>
		1213	</xsl:for-each>
		1214	</xsl:otherwise>
		1215	</xsl:choose>
		1216	<xsl:text>]</xsl:text>
		1217	</span>
		1218	</xsl:if>
1183	</a>	1219	</a>
1184	<xsl:choose>	1220	<xsl:choose>
1185	<xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> \| </xsl:text></span></xsl:otherwise>	1221	<xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> \| </xsl:text></span></xsl:otherwise>

Lines 339-395 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-51 / +77 lines)
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>

Lines 1189-1195 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-10 / +45 lines)
1189	<xsl:for-each select="$authorfield">	1189	<xsl:for-each select="$authorfield">
1190	<xsl:choose>	1190	<xsl:choose>
1191	<xsl:when test="position()>1"/>	1191	<xsl:when test="position()>1"/>
1192	<xsl:when test="@tag<700">Author(s): </xsl:when>	1192	<!-- #13383 -->
		1193	<xsl:when test="@tag<700">By: </xsl:when>
1193	<!--#13382 Changed Additional author to contributor -->	1194	<!--#13382 Changed Additional author to contributor -->
1194	<xsl:otherwise>Contributor(s): </xsl:otherwise>	1195	<xsl:otherwise>Contributor(s): </xsl:otherwise>
1195	</xsl:choose>	1196	</xsl:choose>
Lines 1233-1241 Link Here
1233	</xsl:choose>	1234	</xsl:choose>
1234	<span property="name">	1235	<span property="name">
1235	<xsl:choose>	1236	<xsl:choose>
1236	<xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>	1237	<xsl:when test="@tag=100 or @tag=110 or @tag=111">
1237	<xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>	1238	<!-- #13383 -->
1238	<xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>	1239	<xsl:call-template name="chopPunctuation">
		1240	<xsl:with-param name="chopString">
		1241	<xsl:call-template name="subfieldSelect">
		1242	<xsl:with-param name="codes">
		1243	<xsl:choose>
		1244	<!-- #13383 include subfield e for field 111 -->
		1245	<xsl:when test="@tag=111">abcdeqt</xsl:when>
		1246	<xsl:otherwise>abcdjqt</xsl:otherwise>
		1247	</xsl:choose>
		1248	</xsl:with-param>
		1249	</xsl:call-template>
		1250	</xsl:with-param>
		1251	<xsl:with-param name="punctuation">
		1252	<xsl:text>:,;/ </xsl:text>
		1253	</xsl:with-param>
		1254	</xsl:call-template>
		1255	</xsl:when>
1239	<!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->	1256	<!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1240	<!--#13382 Added all relevant subfields 4, e, are handled separately -->	1257	<!--#13382 Added all relevant subfields 4, e, are handled separately -->
1241	<xsl:when test="@tag=700 or @tag=710 or @tag=711">	1258	<xsl:when test="@tag=700 or @tag=710 or @tag=711">
Lines 1255-1265 Link Here
1255	</xsl:when>	1272	</xsl:when>
1256	</xsl:choose>	1273	</xsl:choose>
1257	</span></span></span>	1274	</span></span></span>
1258	<!-- add relator code too between brackets-->	1275	<!-- #13383 include relator code j for field 111 -->
1259	<xsl:if test="marc:subfield[@code='4' or @code='e']">	1276	<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'][. != ''])">
1260	<span class="relatorcode">	1277	<span class="relatorcode">
1261	<xsl:text> [</xsl:text>	1278	<xsl:text> [</xsl:text>
1262	<xsl:choose>	1279	<xsl:choose>
		1280	<xsl:when test="@tag=111">
		1281	<xsl:choose>
		1282	<!-- Prefer j over 4 -->
		1283	<xsl:when test="marc:subfield[@code='j']">
		1284	<xsl:for-each select="marc:subfield[@code='j']">
		1285	<xsl:value-of select="."/>
		1286	<xsl:if test="position() != last()">, </xsl:if>
		1287	</xsl:for-each>
		1288	</xsl:when>
		1289	<xsl:otherwise>
		1290	<xsl:for-each select="marc:subfield[@code=4]">
		1291	<xsl:value-of select="."/>
		1292	<xsl:if test="position() != last()">, </xsl:if>
		1293	</xsl:for-each>
		1294	</xsl:otherwise>
		1295	</xsl:choose>
		1296	</xsl:when>
		1297	<!-- Prefer e over 4 -->
1263	<xsl:when test="marc:subfield[@code='e']">	1298	<xsl:when test="marc:subfield[@code='e']">
1264	<xsl:for-each select="marc:subfield[@code='e']">	1299	<xsl:for-each select="marc:subfield[@code='e']">
1265	<xsl:value-of select="."/>	1300	<xsl:value-of select="."/>
Lines 1288-1297 Link Here
1288	</xsl:element>	1323	</xsl:element>
1289	</a>	1324	</a>
1290	</xsl:if>	1325	</xsl:if>
1291	</xsl:for-each>	1326	<xsl:choose>
1292	<xsl:choose>	1327	<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:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> \| </xsl:text></span></xsl:otherwise>	1328	</xsl:choose>
1294	</xsl:choose>	1329	</xsl:for-each>
1295	</h5>	1330	</h5>
1296	</xsl:if>	1331	</xsl:if>
1297	</xsl:template>	1332	</xsl:template>

Lines 454-510 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-48 / +64 lines)
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	-