From a44326e3b434ff4d1045892306ad47f1055bf1fc Mon Sep 17 00:00:00 2001 From: "A. Sassmannshausen" <alex.sassmannshausen@ptfs-europe.com> Date: Thu, 13 Mar 2014 16:06:29 +0000 Subject: [PATCH] Bug 11762 - intranet & prog: Re-order 245 $a $b $h in results. In the results view for OPAC and Intranet search results, titles are currently displayed in 245 $a $b $h order. In detailed view the titles are displayed in the better 245 $a $h $b order. This patch corrects the behaviour for NORMARCS and MARC21: all now display 245 $a $h $b. To test: - Find records containing 245 $a $b and $h fields. - Compare the way they look in detail and results view in OPAC (non-bootstrap) and intranet (you should see a discrepancies). - Apply the patch. - Re-check detail and results view: all should now look the same in both OPAC (non-bootstrap) and intranet. --- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 8 ++++---- .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 12 ++++++------ .../prog/en/xslt/NORMARCslim2intranetResults.xsl | 8 ++++---- .../opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl | 8 ++++---- .../opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl | 12 ++++++------ .../opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index cbc505d..aad159b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -297,16 +297,16 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> + <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> + <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template> </xsl:if> - <xsl:if test="marc:subfield[@code='h']"> + <xsl:if test="marc:subfield[@code='b']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">h</xsl:with-param> + <xsl:with-param name="codes">b</xsl:with-param> </xsl:call-template> </xsl:if> <xsl:text> </xsl:text> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl index fb21015..3271e5b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl @@ -65,18 +65,18 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> - <xsl:text> : </xsl:text> - <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> - </xsl:call-template> - </xsl:if> <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> (<xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template>) </xsl:if> + <xsl:if test="marc:subfield[@code='b']"> + <xsl:text> : </xsl:text> + <xsl:call-template name="subfieldSelect"> + <xsl:with-param name="codes">b</xsl:with-param> + </xsl:call-template> + </xsl:if> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">np</xsl:with-param> diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl index 6bde40a..b4893b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl @@ -251,16 +251,16 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> + <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> + <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template> </xsl:if> - <xsl:if test="marc:subfield[@code='h']"> + <xsl:if test="marc:subfield[@code='b']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">h</xsl:with-param> + <xsl:with-param name="codes">b</xsl:with-param> </xsl:call-template> </xsl:if> <xsl:text> </xsl:text> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 520c717..9ade085 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -410,16 +410,16 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> + <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> + <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template> </xsl:if> - <xsl:if test="marc:subfield[@code='h']"> + <xsl:if test="marc:subfield[@code='b']"> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">h</xsl:with-param> + <xsl:with-param name="codes">b</xsl:with-param> </xsl:call-template> </xsl:if> <xsl:text> </xsl:text> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl index 25f6604..d2dd57a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl @@ -66,18 +66,18 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> - <xsl:text> : </xsl:text> - <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> - </xsl:call-template> - </xsl:if> <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> (<xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template>) </xsl:if> + <xsl:if test="marc:subfield[@code='b']"> + <xsl:text> : </xsl:text> + <xsl:call-template name="subfieldSelect"> + <xsl:with-param name="codes">b</xsl:with-param> + </xsl:call-template> + </xsl:if> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">np</xsl:with-param> diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl index 64560fd..a86affb 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl @@ -293,18 +293,18 @@ <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">a</xsl:with-param> </xsl:call-template> - <xsl:if test="marc:subfield[@code='b']"> - <xsl:text> : </xsl:text> - <xsl:call-template name="subfieldSelect"> - <xsl:with-param name="codes">b</xsl:with-param> - </xsl:call-template> - </xsl:if> <xsl:if test="marc:subfield[@code='h']"> <xsl:text> </xsl:text> (<xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">h</xsl:with-param> </xsl:call-template>) </xsl:if> + <xsl:if test="marc:subfield[@code='b']"> + <xsl:text> : </xsl:text> + <xsl:call-template name="subfieldSelect"> + <xsl:with-param name="codes">b</xsl:with-param> + </xsl:call-template> + </xsl:if> <xsl:text> </xsl:text> <xsl:call-template name="subfieldSelect"> <xsl:with-param name="codes">np</xsl:with-param> -- 1.7.10.4