Revert "Bug 36111 - 856$h should not appear as a link in detailed record"
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Katrin Fischer
parent
c317bb34c0
commit
09eb174599
|
|
@ -921,9 +921,7 @@
|
|||
</xsl:if>
|
||||
|
||||
<xsl:if test="marc:datafield[@tag=856]">
|
||||
<xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
|
||||
<span class="results_summary online_resources">
|
||||
<span class="label">Online resources: </span>
|
||||
<span class="results_summary online_resources"><span class="label">Online resources: </span>
|
||||
<xsl:for-each select="marc:datafield[@tag=856]">
|
||||
<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
|
||||
<a>
|
||||
|
|
@ -935,14 +933,11 @@
|
|||
</xsl:call-template>
|
||||
<xsl:value-of select="marc:subfield[@code='u']"/>
|
||||
</xsl:attribute>
|
||||
<xsl:if test="not(marc:subfield[@code='u'])">
|
||||
<xsl:attribute name="style">pointer-events: none; color: #202020;</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
|
||||
<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z'] and marc:subfield[@code='u']">
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
|
||||
<xsl:call-template name="subfieldSelect">
|
||||
<xsl:with-param name="codes">y3z</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
|
|
@ -952,20 +947,20 @@
|
|||
<xsl:when test="$URLLinkText!=''">
|
||||
<xsl:value-of select="$URLLinkText"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='u']">
|
||||
<xsl:otherwise>
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:when>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</a>
|
||||
<xsl:choose>
|
||||
<xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
|
||||
<xsl:when test="(marc:subfield[@code='y'] or marc:subfield[@code='3'] or marc:subfield[@code='z'] or marc:subfield[@code='u']) and marc:subfield[@code='u']"><xsl:text> | </xsl:text></xsl:when>
|
||||
<xsl:otherwise> | </xsl:otherwise>
|
||||
</xsl:choose>
|
||||
|
||||
</xsl:for-each>
|
||||
</span>
|
||||
</xsl:if>
|
||||
</xsl:if>
|
||||
|
||||
<!-- 505 - Formatted contents note -->
|
||||
|
|
|
|||
|
|
@ -978,9 +978,8 @@
|
|||
</xsl:call-template>
|
||||
|
||||
<xsl:if test="marc:datafield[@tag=856]">
|
||||
<xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
|
||||
<span class="results_summary online_resources">
|
||||
<span class="label">Online resources: </span>
|
||||
<span class="label">Online resources: </span>
|
||||
<xsl:for-each select="marc:datafield[@tag=856]">
|
||||
<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
|
||||
<a>
|
||||
|
|
@ -992,14 +991,11 @@
|
|||
</xsl:call-template>
|
||||
<xsl:value-of select="marc:subfield[@code='u']"/>
|
||||
</xsl:attribute>
|
||||
<xsl:if test="not(marc:subfield[@code='u'])">
|
||||
<xsl:attribute name="style">pointer-events: none; color: #202020;</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
|
||||
<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z'] and marc:subfield[@code='u']">
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
|
||||
<xsl:call-template name="subfieldSelect">
|
||||
<xsl:with-param name="codes">y3z</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
|
|
@ -1009,20 +1005,19 @@
|
|||
<xsl:when test="$URLLinkText!=''">
|
||||
<xsl:value-of select="$URLLinkText"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='u']">
|
||||
<xsl:otherwise>
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:when>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</a>
|
||||
<xsl:choose>
|
||||
<xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
|
||||
<xsl:when test="(marc:subfield[@code='y'] or marc:subfield[@code='3'] or marc:subfield[@code='z'] or marc:subfield[@code='u']) and marc:subfield[@code='u']"><xsl:text> | </xsl:text></xsl:when>
|
||||
<xsl:otherwise> | </xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:for-each>
|
||||
</span>
|
||||
</xsl:if>
|
||||
</xsl:if>
|
||||
|
||||
<!-- Content Warning -->
|
||||
|
|
|
|||
|
|
@ -1038,11 +1038,12 @@
|
|||
|
||||
<!-- Image processing code added here, takes precedence over text links including y3z text -->
|
||||
<xsl:if test="marc:datafield[@tag=856]">
|
||||
<xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
|
||||
<span class="results_summary online_resources">
|
||||
<span class="label">Online resources: </span>
|
||||
<span class="label">Online resources: </span>
|
||||
<ul class="resource_list">
|
||||
<xsl:for-each select="marc:datafield[@tag=856]">
|
||||
<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
|
||||
<li>
|
||||
<a property="url">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$OPACTrackClicks='track'">
|
||||
|
|
@ -1060,9 +1061,6 @@
|
|||
</xsl:call-template>
|
||||
<xsl:value-of select="marc:subfield[@code='u']"/>
|
||||
</xsl:attribute>
|
||||
<xsl:if test="not(marc:subfield[@code='u'])">
|
||||
<xsl:attribute name="style">pointer-events: none; color: #202020;</xsl:attribute>
|
||||
</xsl:if>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<xsl:if test="$OPACURLOpenInNewWindow='1'">
|
||||
|
|
@ -1072,30 +1070,23 @@
|
|||
<xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
|
||||
<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="style">height:100px</xsl:attribute></xsl:element><xsl:text></xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z'] and marc:subfield[@code='u']">
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
|
||||
<xsl:call-template name="subfieldSelect">
|
||||
<xsl:with-param name="codes">y3z</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
</xsl:when>
|
||||
<xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$URLLinkText!=''">
|
||||
<xsl:value-of select="$URLLinkText"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='u']">
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
<xsl:when test="$URLLinkText!=''">
|
||||
<xsl:value-of select="$URLLinkText"/>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</a>
|
||||
<xsl:choose>
|
||||
<xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
|
||||
<xsl:when test="(marc:subfield[@code='y'] or marc:subfield[@code='3'] or marc:subfield[@code='z'] or marc:subfield[@code='u']) and marc:subfield[@code='u']"><xsl:text> | </xsl:text></xsl:when>
|
||||
</xsl:choose>
|
||||
</li>
|
||||
</xsl:for-each>
|
||||
</ul>
|
||||
</span>
|
||||
</xsl:if>
|
||||
</xsl:if>
|
||||
|
||||
<!-- 787 Other Relationship Entry -->
|
||||
|
|
|
|||
|
|
@ -1216,13 +1216,13 @@
|
|||
</xsl:if>
|
||||
|
||||
<xsl:if test="marc:datafield[@tag=856]">
|
||||
<xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
|
||||
<div class="results_summary online_resources">
|
||||
<span class="label">Online resources: </span>
|
||||
<ul class="resource_list">
|
||||
<xsl:for-each select="marc:datafield[@tag=856]">
|
||||
<xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
|
||||
<xsl:if test="$OPACURLOpenInNewWindow='0'">
|
||||
<a>
|
||||
<li><a>
|
||||
<xsl:choose>
|
||||
<xsl:when test="$OPACTrackClicks='track'">
|
||||
<xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
|
||||
|
|
@ -1239,16 +1239,13 @@
|
|||
</xsl:call-template>
|
||||
<xsl:value-of select="marc:subfield[@code='u']"/>
|
||||
</xsl:attribute>
|
||||
<xsl:if test="not(marc:subfield[@code='u'])">
|
||||
<xsl:attribute name="style">pointer-events: none; color: #202020;</xsl:attribute>
|
||||
</xsl:if>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<xsl:choose>
|
||||
<xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
|
||||
<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="style">height:100px;</xsl:attribute></xsl:element><xsl:text></xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z'] and marc:subfield[@code='u']">
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
|
||||
<xsl:call-template name="subfieldSelect">
|
||||
<xsl:with-param name="codes">y3z</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
|
|
@ -1258,16 +1255,16 @@
|
|||
<xsl:when test="$URLLinkText!=''">
|
||||
<xsl:value-of select="$URLLinkText"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='u']">
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</a>
|
||||
</a></li>
|
||||
</xsl:if>
|
||||
<xsl:if test="$OPACURLOpenInNewWindow='1'">
|
||||
<a target='_blank'>
|
||||
<li><a target='_blank'>
|
||||
<xsl:choose>
|
||||
<xsl:when test="$OPACTrackClicks='track'">
|
||||
<xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
|
||||
|
|
@ -1277,16 +1274,13 @@
|
|||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
|
||||
<xsl:if test="not(marc:subfield[@code='u'])">
|
||||
<xsl:attribute name="style">pointer-events: none; color: #202020;</xsl:attribute>
|
||||
</xsl:if>
|
||||
</xsl:otherwise>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<xsl:choose>
|
||||
<xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
|
||||
<xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="style">height:100px</xsl:attribute></xsl:element><xsl:text></xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z'] and marc:subfield[@code='u']">
|
||||
<xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
|
||||
<xsl:call-template name="subfieldSelect">
|
||||
<xsl:with-param name="codes">y3z</xsl:with-param>
|
||||
</xsl:call-template>
|
||||
|
|
@ -1296,22 +1290,18 @@
|
|||
<xsl:when test="$URLLinkText!=''">
|
||||
<xsl:value-of select="$URLLinkText"/>
|
||||
</xsl:when>
|
||||
<xsl:when test="marc:subfield[@code='u']">
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:text>Click here to access online</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
</xsl:choose>
|
||||
</a>
|
||||
</a></li>
|
||||
</xsl:if>
|
||||
<xsl:choose>
|
||||
<xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when>
|
||||
<xsl:when test="(marc:subfield[@code='y'] or marc:subfield[@code='3'] or marc:subfield[@code='z'] or marc:subfield[@code='u']) and marc:subfield[@code='u']"><xsl:text> | </xsl:text></xsl:when>
|
||||
</xsl:choose>
|
||||
</xsl:for-each>
|
||||
</ul>
|
||||
</div>
|
||||
</xsl:if>
|
||||
</xsl:if>
|
||||
|
||||
<!-- Availability line -->
|
||||
<div class="results_summary availability">
|
||||
|
|
|
|||
Loading…
Reference in New Issue