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

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-36 / +143 lines)
Lines 3-8 Link Here
3
<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
3
<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
4
4
5
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
5
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
6
6
<xsl:stylesheet version="1.0"
7
<xsl:stylesheet version="1.0"
7
  xmlns:marc="http://www.loc.gov/MARC21/slim"
8
  xmlns:marc="http://www.loc.gov/MARC21/slim"
8
  xmlns:items="http://www.koha-community.org/items"
9
  xmlns:items="http://www.koha-community.org/items"
Lines 140-148 Link Here
140
        </xsl:if>
141
        </xsl:if>
141
142
142
        <!-- Author Statement -->
143
        <!-- Author Statement -->
143
        <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>
144
        <!-- #13382 suppress 700$i and 7xx/@ind2=2 -->
144
        <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>
145
        <xsl:call-template name="showAuthor">
145
146
            <xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/>
147
            <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
148
        </xsl:call-template>
149
        <xsl:call-template name="showAuthor">
150
            <!-- #13382 suppress 700$i and 7xx/@ind2=2 -->
151
            <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'])]"/>
152
            <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
153
        </xsl:call-template>
154
        
146
    <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
155
    <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
147
        <span class="results_summary type"><span class="label">Material type: </span>
156
        <span class="results_summary type"><span class="label">Material type: </span>
148
        <xsl:element name="img"><xsl:attribute name="src">/intranet-tmpl/prog/img/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
157
        <xsl:element name="img"><xsl:attribute name="src">/intranet-tmpl/prog/img/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
Lines 524-530 Link Here
524
        </xsl:for-each>
533
        </xsl:for-each>
525
        </span>
534
        </span>
526
        </xsl:if>
535
        </xsl:if>
527
536
        
537
        <!-- #13382 Added Related works 700$i -->
538
        <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']]">
539
            <span class="results_summary related_works"><span class="label">Related Works: </span>
540
                <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']]">
541
                    <xsl:variable name="str">   
542
                        <xsl:call-template name="subfieldSelect">
543
                            <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
544
                        </xsl:call-template>
545
                    </xsl:variable>
546
                    <xsl:call-template name="chopPunctuation">
547
                        <xsl:with-param name="chopString">
548
                            <xsl:value-of select="$str"/>    
549
                        </xsl:with-param>
550
                    </xsl:call-template>
551
                    <!-- add relator code too between brackets-->
552
                    <xsl:if test="marc:subfield[@code='4' or @code='e']">
553
                        <span class="relatorcode">
554
                            <xsl:text> [</xsl:text>
555
                            <xsl:choose>
556
                                <xsl:when test="marc:subfield[@code='e']">
557
                                    <xsl:for-each select="marc:subfield[@code='e']">
558
                                        <xsl:value-of select="."/>
559
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
560
                                    </xsl:for-each>
561
                                </xsl:when>
562
                                <xsl:otherwise>
563
                                    <xsl:for-each select="marc:subfield[@code='4']">
564
                                        <xsl:value-of select="."/>
565
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
566
                                    </xsl:for-each>
567
                                </xsl:otherwise>
568
                            </xsl:choose>
569
                            <xsl:text>]</xsl:text>
570
                        </span>
571
                    </xsl:if>
572
                    <xsl:choose>
573
                        <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
574
                    </xsl:choose>
575
                </xsl:for-each>
576
            </span> 
577
        </xsl:if>
578
        
579
        <!-- #13382 Added Contained Works 7xx@ind2=2 -->
580
        <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'])]">
581
            <span class="results_summary contained_works"><span class="label">Contained Works: </span>
582
                <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'])]">
583
                    <xsl:variable name="str">   
584
                        <xsl:call-template name="subfieldSelect">
585
                            <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
586
                        </xsl:call-template>
587
                    </xsl:variable>
588
                    <xsl:call-template name="chopPunctuation">
589
                        <xsl:with-param name="chopString">
590
                            <xsl:value-of select="$str"/>    
591
                        </xsl:with-param>
592
                    </xsl:call-template>
593
                    <!-- add relator code too between brackets-->
594
                    <xsl:if test="marc:subfield[@code='4' or @code='e']">
595
                        <span class="relatorcode">
596
                            <xsl:text> [</xsl:text>
597
                            <xsl:choose>
598
                                <xsl:when test="marc:subfield[@code='e']">
599
                                    <xsl:for-each select="marc:subfield[@code='e']">
600
                                        <xsl:value-of select="."/>
601
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
602
                                    </xsl:for-each>
603
                                </xsl:when>
604
                                <xsl:otherwise>
605
                                    <xsl:for-each select="marc:subfield[@code='4']">
606
                                        <xsl:value-of select="."/>
607
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
608
                                    </xsl:for-each>
609
                                </xsl:otherwise>
610
                            </xsl:choose>
611
                            <xsl:text>]</xsl:text>
612
                        </span>
613
                    </xsl:if>
614
                    <xsl:choose>
615
                        <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
616
                    </xsl:choose>
617
                </xsl:for-each>
618
            </span> 
619
        </xsl:if>
528
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
620
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
529
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
621
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
530
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
622
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
Lines 565-586 Link Here
565
            </span>
657
            </span>
566
        </xsl:if>
658
        </xsl:if>
567
659
568
<!-- DDC classification -->
569
    <xsl:if test="marc:datafield[@tag=082]">
570
        <span class="results_summary ddc">
571
            <span class="label">DDC classification: </span>
572
            <xsl:for-each select="marc:datafield[@tag=082]">
573
                <xsl:call-template name="subfieldSelect">
574
                    <xsl:with-param name="codes">a</xsl:with-param>
575
                </xsl:call-template>
576
                <xsl:choose>
577
                    <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
578
                    <xsl:otherwise> | </xsl:otherwise>
579
                </xsl:choose>
580
            </xsl:for-each>
581
        </span>
582
    </xsl:if>
583
584
        <xsl:if test="marc:datafield[@tag=856]">
660
        <xsl:if test="marc:datafield[@tag=856]">
585
        <span class="results_summary online_resources"><span class="label">Online resources: </span>
661
        <span class="results_summary online_resources"><span class="label">Online resources: </span>
586
        <xsl:for-each select="marc:datafield[@tag=856]">
662
        <xsl:for-each select="marc:datafield[@tag=856]">
Lines 965-971 Link Here
965
        <xsl:choose>
1041
        <xsl:choose>
966
          <xsl:when test="position()&gt;1"/>
1042
          <xsl:when test="position()&gt;1"/>
967
          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
1043
          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
968
          <xsl:otherwise>Additional author(s): </xsl:otherwise>
1044
            <!--#13382 Changed Additional author to contributor -->
1045
            <xsl:otherwise>Contributor(s): </xsl:otherwise>
969
        </xsl:choose>
1046
        </xsl:choose>
970
        <a>
1047
        <a>
971
        <xsl:choose>
1048
        <xsl:choose>
Lines 977-1004 Link Here
977
            </xsl:otherwise>
1054
            </xsl:otherwise>
978
        </xsl:choose>
1055
        </xsl:choose>
979
	<xsl:choose>
1056
	<xsl:choose>
980
          <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when>
1057
        <xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>
981
          <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
1058
        <xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>
982
          <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
1059
        <xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>
1060
   	    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1061
   	    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1062
   	    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1063
   	        <xsl:variable name="str">
1064
   	            <xsl:call-template name="subfieldSelect">
1065
   	                <xsl:with-param name="codes">abcdfghiklmnoprstux</xsl:with-param>
1066
   	            </xsl:call-template>
1067
   	        </xsl:variable>
1068
   	        <xsl:call-template name="chopPunctuation">
1069
   	            <xsl:with-param name="chopString">
1070
   	                <xsl:value-of select="$str"/>
1071
   	            </xsl:with-param>
1072
   	            <xsl:with-param name="punctuation">
1073
   	                <xsl:text>:,;/. </xsl:text>
1074
   	            </xsl:with-param>
1075
   	        </xsl:call-template>
1076
   	    </xsl:when>
983
	</xsl:choose>
1077
	</xsl:choose>
984
	<!-- add relator code too between brackets-->
1078
	<!-- add relator code too between brackets-->
985
	<xsl:if test="marc:subfield[@code='4' or @code='e']">
1079
        <xsl:if test="marc:subfield[@code='4' or @code='e']">
986
      <span class="relatorcode">
1080
                <xsl:if test="not(@tag=111 or @tag=711)">
987
      <xsl:text> [</xsl:text>
1081
                    <span class="relatorcode">
988
	  <xsl:choose>
1082
                        <xsl:text> [</xsl:text>
989
	    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
1083
                        <!-- #13382 If both $e and $4 are present only display $e -->
990
	    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
1084
                        <xsl:choose>
991
	  </xsl:choose>
1085
                            <xsl:when test="marc:subfield[@code='e']">
992
	  <xsl:text>]</xsl:text>
1086
                                <xsl:for-each select="marc:subfield[@code='e']">
993
      </span>
1087
                                    <xsl:value-of select="."/>
994
	</xsl:if>
1088
                                    <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
1089
                                </xsl:for-each>
1090
                            </xsl:when>
1091
                            <xsl:otherwise>
1092
                                <xsl:for-each select="marc:subfield[@code='4']">
1093
                                    <xsl:value-of select="."/>
1094
                                    <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
1095
                                </xsl:for-each>
1096
                            </xsl:otherwise>
1097
                        </xsl:choose>
1098
                        <xsl:text>]</xsl:text>
1099
                    </span>
1100
                </xsl:if>
1101
            </xsl:if>
995
	</a>
1102
	</a>
996
        <xsl:choose>
1103
        <xsl:choose>
997
          <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise>
1104
            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
998
        </xsl:choose>
1105
        </xsl:choose>
999
        </xsl:for-each>
1106
        </xsl:for-each>
1000
        </h5>
1107
        </h5>
1001
        </xsl:if>
1108
        </xsl:if>
1002
    </xsl:template>
1109
    </xsl:template>
1003
1110
1004
</xsl:stylesheet>
1111
</xsl:stylesheet>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-48 / +160 lines)
Lines 1-5 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
2
<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
3
3
<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
4
<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
4
<xsl:stylesheet version="1.0"
5
<xsl:stylesheet version="1.0"
5
  xmlns:marc="http://www.loc.gov/MARC21/slim"
6
  xmlns:marc="http://www.loc.gov/MARC21/slim"
Lines 158-176 Link Here
158
                </xsl:call-template>
159
                </xsl:call-template>
159
            </h5>
160
            </h5>
160
        </xsl:if>
161
        </xsl:if>
161
        <xsl:choose>
162
            
162
            <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]">
163
            <!--#13382 Added Author Statement to seperate Authors and Contributors -->
163
                <h5 class="author">by
164
            <xsl:call-template name="showAuthor">
164
                    <xsl:call-template name="showAuthor">
165
                <xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/>
165
                        <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]"/>
166
                <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
166
                        <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
167
                <xsl:with-param name="materialTypeLabel" select="$materialTypeLabel"/>
167
                        <xsl:with-param name="materialTypeLabel" select="$materialTypeLabel"/>
168
                <xsl:with-param name="theme" select="$theme"/>
168
                        <xsl:with-param name="theme" select="$theme"/>
169
            </xsl:call-template>
169
                    </xsl:call-template>
170
            <xsl:call-template name="showAuthor">
170
                </h5>
171
                <!-- #13382 suppress 700$i and 7xx/@ind2=2 -->
171
            </xsl:when>
172
                <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'])]"/>
172
        </xsl:choose>
173
                <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
173
174
            </xsl:call-template>
174
   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
175
   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
175
        <xsl:if test="$materialTypeCode!=''">
176
        <xsl:if test="$materialTypeCode!=''">
176
        <span class="results_summary type"><span class="label">Material type: </span>
177
        <span class="results_summary type"><span class="label">Material type: </span>
Lines 572-577 Link Here
572
        </span>
573
        </span>
573
        </xsl:if>
574
        </xsl:if>
574
575
576
577
            <!-- #13382 Added Related works 700$i -->
578
            <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']]">
579
                <span class="results_summary related_works"><span class="label">Related Works: </span>
580
                    <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']]">
581
                        <xsl:variable name="str">   
582
                            <xsl:call-template name="subfieldSelect">
583
                                <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
584
                            </xsl:call-template>
585
                        </xsl:variable>
586
                        <xsl:call-template name="chopPunctuation">
587
                            <xsl:with-param name="chopString">
588
                                <xsl:value-of select="$str"/>    
589
                            </xsl:with-param>
590
                        </xsl:call-template>
591
                        <!-- add relator code too between brackets-->
592
                        <xsl:if test="marc:subfield[@code='4' or @code='e']">
593
                            <span class="relatorcode">
594
                                <xsl:text> [</xsl:text>
595
                                <xsl:choose>
596
                                    <xsl:when test="marc:subfield[@code='e']">
597
                                        <xsl:for-each select="marc:subfield[@code='e']">
598
                                            <xsl:value-of select="."/>
599
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
600
                                        </xsl:for-each>
601
                                    </xsl:when>
602
                                    <xsl:otherwise>
603
                                        <xsl:for-each select="marc:subfield[@code='4']">
604
                                            <xsl:value-of select="."/>
605
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
606
                                        </xsl:for-each>
607
                                    </xsl:otherwise>
608
                                </xsl:choose>
609
                                <xsl:text>]</xsl:text>
610
                            </span>
611
                        </xsl:if>
612
                        <xsl:choose>
613
                            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
614
                        </xsl:choose>
615
                    </xsl:for-each>
616
                </span> 
617
            </xsl:if>
618
            
619
            <!-- #13382 Added Contained Works 7xx@ind2=2 -->
620
            <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'])]">
621
                <span class="results_summary contained_works"><span class="label">Contained Works: </span>
622
                    <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'])]">
623
                        <xsl:variable name="str">   
624
                            <xsl:call-template name="subfieldSelect">
625
                                <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
626
                            </xsl:call-template>
627
                        </xsl:variable>
628
                        <xsl:call-template name="chopPunctuation">
629
                            <xsl:with-param name="chopString">
630
                                <xsl:value-of select="$str"/>    
631
                            </xsl:with-param>
632
                        </xsl:call-template>
633
                        <!-- add relator code too between brackets-->
634
                        <xsl:if test="marc:subfield[@code='4' or @code='e']">
635
                            <span class="relatorcode">
636
                                <xsl:text> [</xsl:text>
637
                                <xsl:choose>
638
                                    <xsl:when test="marc:subfield[@code='e']">
639
                                        <xsl:for-each select="marc:subfield[@code='e']">
640
                                            <xsl:value-of select="."/>
641
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
642
                                        </xsl:for-each>
643
                                    </xsl:when>
644
                                    <xsl:otherwise>
645
                                        <xsl:for-each select="marc:subfield[@code='4']">
646
                                            <xsl:value-of select="."/>
647
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
648
                                        </xsl:for-each>
649
                                    </xsl:otherwise>
650
                                </xsl:choose>
651
                                <xsl:text>]</xsl:text>
652
                            </span>
653
                        </xsl:if>
654
                        <xsl:choose>
655
                            <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
656
                        </xsl:choose>
657
                    </xsl:for-each>
658
                </span> 
659
            </xsl:if>
660
            
575
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
661
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
576
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
662
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
577
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
663
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
Lines 625-647 Link Here
625
            </span>
711
            </span>
626
        </xsl:if>
712
        </xsl:if>
627
713
628
<!-- DDC classification -->
629
    <xsl:if test="marc:datafield[@tag=082]">
630
        <span class="results_summary ddc">
631
            <span class="label">DDC classification: </span>
632
            <xsl:for-each select="marc:datafield[@tag=082]">
633
                <xsl:call-template name="subfieldSelect">
634
                    <xsl:with-param name="codes">a</xsl:with-param>
635
                </xsl:call-template>
636
                <xsl:choose>
637
                    <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
638
                    <xsl:otherwise> | </xsl:otherwise>
639
                </xsl:choose>
640
            </xsl:for-each>
641
        </span>
642
    </xsl:if>
643
644
645
<!-- Image processing code added here, takes precedence over text links including y3z text   -->
714
<!-- Image processing code added here, takes precedence over text links including y3z text   -->
646
        <xsl:if test="marc:datafield[@tag=856]">
715
        <xsl:if test="marc:datafield[@tag=856]">
647
        <span class="results_summary online_resources"><span class="label">Online resources: </span>
716
        <span class="results_summary online_resources"><span class="label">Online resources: </span>
Lines 1042-1051 Link Here
1042
        <xsl:param name="UseAuthoritiesForTracings" />
1111
        <xsl:param name="UseAuthoritiesForTracings" />
1043
        <xsl:param name="materialTypeLabel" />
1112
        <xsl:param name="materialTypeLabel" />
1044
        <xsl:param name="theme" />
1113
        <xsl:param name="theme" />
1114
        <xsl:if test="count($authorfield)&gt;0">
1115
        <!--#13382 Changed Additional author to contributor -->
1116
        <h5>
1045
        <xsl:for-each select="$authorfield">
1117
        <xsl:for-each select="$authorfield">
1046
            <xsl:choose><xsl:when test="position()!=1"><xsl:text>; </xsl:text></xsl:when></xsl:choose>
1047
            <xsl:choose>
1118
            <xsl:choose>
1048
                <xsl:when test="not(@tag=111 or @tag=711)" />
1119
                <xsl:when test="position()&gt;1"/>
1120
                <xsl:when test="@tag&lt;700">by </xsl:when>
1121
                <!--#13382 Changed Additional author to contributor -->
1122
                <xsl:otherwise>Contributor(s): </xsl:otherwise>
1123
            </xsl:choose>
1124
            <xsl:choose>
1125
                <xsl:when test="not(@tag=111) or @tag=700 or @tag=710 or @tag=711" />
1049
                <xsl:when test="marc:subfield[@code='n']">
1126
                <xsl:when test="marc:subfield[@code='n']">
1050
                    <xsl:text> </xsl:text>
1127
                    <xsl:text> </xsl:text>
1051
                    <xsl:call-template name="subfieldSelect">
1128
                    <xsl:call-template name="subfieldSelect">
Lines 1084-1104 Link Here
1084
                    </xsl:choose>
1161
                    </xsl:choose>
1085
                <span property="name">
1162
                <span property="name">
1086
                <xsl:choose>
1163
                <xsl:choose>
1087
                    <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when>
1164
                    <xsl:when test="@tag=100"><xsl:call-template name="nameABCQ"/></xsl:when>
1088
                    <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
1165
                    <xsl:when test="@tag=110"><xsl:call-template name="nameABCDN"/></xsl:when>
1089
                    <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
1166
                    <xsl:when test="@tag=111"><xsl:call-template name="nameACDEQ"/></xsl:when>
1167
                    <!-- #13382 excludes 700$i and ind2=2, displayed as Related Works -->
1168
                    <!--#13382 Added all relevant subfields 4, e, are handled separately -->
1169
                    <xsl:when test="@tag=700 or @tag=710 or @tag=711">
1170
                        <xsl:variable name="str">
1171
                            <xsl:call-template name="subfieldSelect">
1172
                                <xsl:with-param name="codes">abcdfghiklmnoprstux</xsl:with-param>
1173
                            </xsl:call-template>
1174
                        </xsl:variable>
1175
                        <xsl:call-template name="chopPunctuation">
1176
                            <xsl:with-param name="chopString">
1177
                                <xsl:value-of select="$str"/>
1178
                            </xsl:with-param>
1179
                            <xsl:with-param name="punctuation">
1180
                                <xsl:text>:,;/. </xsl:text>
1181
                            </xsl:with-param>
1182
                        </xsl:call-template>
1183
                    </xsl:when>
1090
                </xsl:choose>
1184
                </xsl:choose>
1091
                </span></span></span>
1185
                </span>
1092
                <!-- add relator code too between brackets-->
1186
                </span>
1187
                </span>
1188
                <!-- #13382 If both $e and $4 are present only display $e -->
1093
                <xsl:if test="marc:subfield[@code='4' or @code='e']">
1189
                <xsl:if test="marc:subfield[@code='4' or @code='e']">
1094
                    <span class="relatorcode">
1190
                    <xsl:if test="not(@tag=111 or @tag=711)">
1095
                    <xsl:text> [</xsl:text>
1191
                        <span class="relatorcode">
1096
                    <xsl:choose>
1192
                            <xsl:text> [</xsl:text>
1097
                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
1193
                            <xsl:choose>
1098
                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
1194
                                <xsl:when test="marc:subfield[@code='e']">
1099
                    </xsl:choose>
1195
                                    <xsl:for-each select="marc:subfield[@code='e']">
1100
                    <xsl:text>]</xsl:text>
1196
                                        <xsl:value-of select="."/>
1101
                    </span>
1197
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
1198
                                    </xsl:for-each>
1199
                                </xsl:when>
1200
                                <xsl:otherwise>
1201
                                    <xsl:for-each select="marc:subfield[@code='4']">
1202
                                        <xsl:value-of select="."/>
1203
                                        <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>    
1204
                                    </xsl:for-each>
1205
                                </xsl:otherwise>
1206
                            </xsl:choose>
1207
                            <xsl:text>]</xsl:text>
1208
                        </span> 
1209
                    </xsl:if>
1102
                </xsl:if>
1210
                </xsl:if>
1103
            </a>
1211
            </a>
1104
            <xsl:if test="marc:subfield[@code=9]">
1212
            <xsl:if test="marc:subfield[@code=9]">
Lines 1112-1119 Link Here
1112
                    </xsl:element>
1220
                    </xsl:element>
1113
                </a>
1221
                </a>
1114
            </xsl:if>
1222
            </xsl:if>
1223
            <!--#13382 Changed separator to | -->
1224
            <xsl:choose>
1225
                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
1226
            </xsl:choose>
1115
        </xsl:for-each>
1227
        </xsl:for-each>
1116
        <xsl:text>.</xsl:text>
1228
        </h5>
1229
        </xsl:if>
1117
    </xsl:template>
1230
    </xsl:template>
1118
1231
1119
    <xsl:template name="nameABCQ">
1232
    <xsl:template name="nameABCQ">
Lines 1190-1193 Link Here
1190
        </xsl:variable>
1303
        </xsl:variable>
1191
        <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
1304
        <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
1192
    </xsl:template>
1305
    </xsl:template>
1193
</xsl:stylesheet>
1306
</xsl:stylesheet>
1194
- 

Return to bug 13382