From 252c3f38c8873b6a3ed7a46db640548720c0a1e8 Mon Sep 17 00:00:00 2001 From: Winona Salesky Date: Wed, 16 Sep 2015 12:37:54 -0400 Subject: [PATCH] [SIGNED-OFF]Bug 14734 - Enhance 264 display in OPAC and Staff XSLT. Makes 264 repeatable, prefer 264 over 260. If 264/ind1=3 is present in the record the xslt uses ind1 to determine latest 264, if no ind1=3 then all 264 fields are displayed. Test Plan: 1) Apply this patch 2) Ensure you are using the default XSLT setting for the staff and opac record details 3) Find or create a record with multiple MARC tags 264 4) Perform a search that would show the record in the search results. 5) Review results for correct 264 display. 6) Click title to review record details. Signed-off-by: Hector Castro Works as advertised. 260 not showed when 264 exists, tested with multiple records. If ind1=3 is present shows the current/latest data --- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 66 +++++++--------- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 62 +++++++-------- .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 79 ++++++++----------- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 82 +++++++++----------- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 58 +++++++------- .../bootstrap/en/xslt/MARC21slimUtils.xsl | 82 +++++++++----------- 6 files changed, 193 insertions(+), 236 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index bda73df..8ad6047 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -313,43 +313,37 @@ - - Publisher: - - - - a - - - - - - - b - - - - - - - - cg - - - - ; - - - ; + - - - - - - - - + + + Publisher: + + + + a + + + + + + + b + + + + + + + + cg + + + + ; + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index e913ce5..51af8dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -774,41 +774,35 @@ - - Publisher: - - - - a - - - - - - b - - - - - - - cg - - - - ; - - - ; - - - - - - + - - + + + Publisher: + + + + a + + + + + + b + + + + + + + cg + + + + ; + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 4e799de..38d1acd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -1,6 +1,6 @@ ]> - + @@ -217,60 +217,49 @@ Publisher-latest or Publisher or 'Other'-latest or 'Other' The preferred tag is saved in the fav variable and passed to a helper named-template --> + - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + + - - - Producer: - - - Publisher: - - - Distributor: - - - Manufacturer: - - - - - - - + + + + Producer: + + + Publisher: + + + Distributor: + + + Manufacturer: + + + Copyright Date: + + + + abc + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index a35ef12..5f26dba 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -335,51 +335,45 @@ - - Publisher: - - - - - - a - - - - - - - - b - - - - - - - - - - - cg - - - - - - ; - - - ; - - - - - - + - - + + + Publisher: + + + + + + a + + + + + + + + b + + + + + + + + + + + cg + + + + + + ; + + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 4623dff..ddeb1ca 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -924,39 +924,37 @@ + + + - Publisher: - - - - a - - - - - - b + Publisher: + + + + a + + + + + + b + + + + + + + cg + + + ; + + + ; + - - - - - cg - - - - ; - - - ; - - - - - - - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl index 4f7efed..bc68f37 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl @@ -1,6 +1,6 @@ ]> - + @@ -209,68 +209,56 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - + + + + + - - - Producer: - - - Publisher: - - - Distributor: - - - Manufacturer: - - - - - - - + + + + Producer: + + + Publisher: + + + Distributor: + + + Manufacturer: + + + Copyright Date: + + + + abc + + -