From 176183537f6c3b66e6033479227da3dfcaee193d Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi <tomascohen@gmail.com> Date: Mon, 15 Sep 2014 10:02:10 -0300 Subject: [PATCH] Bug 12900: (consistency followup) add buildBiblioDefaultViewURL to MARC21 XSLT --- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 29 ++++++++-------------- .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 21 ++++++++++++++++ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index e27419d..7ffde6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -290,25 +290,16 @@ </xsl:call-template> </xsl:if> - <a><xsl:attribute name="href"> - <xsl:choose> - <xsl:when test="$IntranetBiblioDefaultView='normal'"> - /cgi-bin/koha/catalogue/detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/> - </xsl:when> - <xsl:when test="$IntranetBiblioDefaultView='isbd'"> - /cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<xsl:value-of select="$biblionumber"/> - </xsl:when> - <xsl:when test="$IntranetBiblioDefaultView='labeled_marc'"> - /cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=<xsl:value-of select="$biblionumber"/> - </xsl:when> - <xsl:when test="$IntranetBiblioDefaultView='marc'"> - /cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<xsl:value-of select="$biblionumber"/> - </xsl:when> - <xsl:otherwise> - /cgi-bin/koha/catalogue/detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/> - </xsl:otherwise> - </xsl:choose> - </xsl:attribute><xsl:attribute name="class">title</xsl:attribute> + <a> + <xsl:attribute name="href"> + <xsl:call-template name="buildBiblioDefaultViewURL"> + <xsl:with-param name="IntranetBiblioDefaultView"> + <xsl:value-of select="$IntranetBiblioDefaultView"/> + </xsl:with-param> + </xsl:call-template> + <xsl:value-of select="$biblionumber"/> + </xsl:attribute> + <xsl:attribute name="class">title</xsl:attribute> <xsl:if test="marc:datafield[@tag=245]"> <xsl:for-each select="marc:datafield[@tag=245]"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 7334d03..e2ae2cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -72,6 +72,27 @@ </xsl:if> </xsl:template> + <xsl:template name="buildBiblioDefaultViewURL"> + <xsl:param name="IntranetBiblioDefaultView"/> + <xsl:choose> + <xsl:when test="$IntranetBiblioDefaultView='normal'"> + <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$IntranetBiblioDefaultView='isbd'"> + <xsl:text>/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$IntranetBiblioDefaultView='labeled_marc'"> + <xsl:text>/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:when test="$IntranetBiblioDefaultView='marc'"> + <xsl:text>/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>/cgi-bin/koha/catalogue/detail.pl?biblionumber=</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <xsl:template name="chopPunctuation"> <xsl:param name="chopString"/> <xsl:variable name="length" select="string-length($chopString)"/> -- 1.9.1