Bugzilla – Attachment 3968 Details for
Bug 6231
System preferences in XSLT view broken
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
proposed patch
0001-Bug-6231-some-system-preferences-in-XSLT-broken.patch (text/plain), 10.84 KB, created by
Katrin Fischer
on 2011-04-21 13:50:22 UTC
(
hide
)
Description:
proposed patch
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2011-04-21 13:50:22 UTC
Size:
10.84 KB
patch
obsolete
>From 78ec1d8504b91b8d998432f9e28ec51ff9341703 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer@bsz-bw.de> >Date: Wed, 20 Apr 2011 05:51:46 +0200 >Subject: [PATCH] Bug 6231: some system preferences in XSLT broken >Content-Type: text/plain; charset="utf-8" > >URL was accidently changed to url, breaking the case sensitive system preference >variables in XSLT. > >- URLLinkTex >- OPACurlOpenInNewWindow >- OPACBaseURL >--- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 12 ++++++------ > .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 12 ++++++------ > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 16 ++++++++-------- > 3 files changed, 20 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index 2f313aa..7906c55 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -17,8 +17,8 @@ > <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/> > > <xsl:variable name="UseControlNumber" select="marc:sysprefs/marc:syspref[@name='UseControlNumber']"/> >- <xsl:variable name="urlLinkText" select="marc:sysprefs/marc:syspref[@name='urlLinkText']"/> >- <xsl:variable name="OPACBaseurl" select="marc:sysprefs/marc:syspref[@name='OPACBaseurl']"/> >+ <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> >+ <xsl:variable name="OPACBaseURL" select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/> > <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable> > <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/> > <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/> >@@ -488,8 +488,8 @@ > </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 test="$URLLinkText!=''"> >+ <xsl:value-of select="$URLLinkText"/> > </xsl:when> > <xsl:otherwise> > <xsl:text>Click here to access online</xsl:text> >@@ -727,9 +727,9 @@ > </xsl:for-each> > </xsl:if> > >- <xsl:if test="$OPACBaseurl!=''"> >+ <xsl:if test="$OPACBaseURL!=''"> > <span class="results_summary"><span class="label">OPAC view: </span> >- <a><xsl:attribute name="href">http://<xsl:value-of select="$OPACBaseurl"/>/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/></xsl:attribute><xsl:attribute name="target">_blank</xsl:attribute>Open in new window</a>. >+ <a><xsl:attribute name="href">http://<xsl:value-of select="$OPACBaseURL"/>/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/></xsl:attribute><xsl:attribute name="target">_blank</xsl:attribute>Open in new window</a>. > </span> > </xsl:if> > >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >index 8277872..369b74b 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >@@ -19,8 +19,8 @@ > > <xsl:variable name="UseControlNumber" select="marc:sysprefs/marc:syspref[@name='UseControlNumber']"/> > <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/> >- <xsl:variable name="OPACurlOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACurlOpenInNewWindow']"/> >- <xsl:variable name="urlLinkText" select="marc:sysprefs/marc:syspref[@name='urlLinkText']"/> >+ <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/> >+ <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> > <xsl:variable name="ShowISBD" select="marc:sysprefs/marc:syspref[@name='viewISBD']"/> > > <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable> >@@ -535,7 +535,7 @@ > <xsl:for-each select="marc:datafield[@tag=856]"> > <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable> > <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute> >- <xsl:if test="$OPACurlOpenInNewWindow='1'"> >+ <xsl:if test="$OPACURLOpenInNewWindow='1'"> > <xsl:attribute name="target">_blank</xsl:attribute> > </xsl:if> > <xsl:choose> >@@ -547,8 +547,8 @@ > <xsl:with-param name="codes">y3z</xsl:with-param> > </xsl:call-template> > </xsl:when> >- <xsl:when test="$urlLinkText!=''"> >- <xsl:value-of select="$urlLinkText"/> >+ <xsl:when test="$URLLinkText!=''"> >+ <xsl:value-of select="$URLLinkText"/> > </xsl:when> > <xsl:otherwise> > <xsl:text>Click here to access online</xsl:text> >@@ -572,7 +572,7 @@ > </xsl:call-template> > <xsl:for-each select="marc:subfield[@code='u']"> > <a><xsl:attribute name="href"><xsl:value-of select="text()"/></xsl:attribute> >- <xsl:if test="$OPACurlOpenInNewWindow='1'"> >+ <xsl:if test="$OPACURLOpenInNewWindow='1'"> > <xsl:attribute name="target">_blank</xsl:attribute> > </xsl:if> > <xsl:value-of select="text()"/> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index 50ce9e4..97d83e2 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -21,8 +21,8 @@ > > <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/> > <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/> >- <xsl:variable name="OPACurlOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACurlOpenInNewWindow']"/> >- <xsl:variable name="urlLinkText" select="marc:sysprefs/marc:syspref[@name='urlLinkText']"/> >+ <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/> >+ <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> > <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/> > <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/> > <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/> >@@ -909,7 +909,7 @@ > <span class="label">Online Access: </span> > <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'"> >+ <xsl:if test="$OPACURLOpenInNewWindow='0'"> > <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute> > <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')"> >@@ -922,8 +922,8 @@ > </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 test="$URLLinkText!=''"> >+ <xsl:value-of select="$URLLinkText"/> > </xsl:when> > <xsl:otherwise> > <xsl:text>Click here to access online</xsl:text> >@@ -933,7 +933,7 @@ > </xsl:choose> > </a> > </xsl:if> >- <xsl:if test="$OPACurlOpenInNewWindow='1'"> >+ <xsl:if test="$OPACURLOpenInNewWindow='1'"> > <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute> > <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')"> >@@ -946,8 +946,8 @@ > </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 test="$URLLinkText!=''"> >+ <xsl:value-of select="$URLLinkText"/> > </xsl:when> > <xsl:otherwise> > <xsl:text>Click here to access online</xsl:text> >-- >1.6.3.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6231
: 3968