From 58079c4cae2df8c3598fbb14d47e213ab27ad75a Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Thu, 16 Feb 2012 12:07:35 +0100 Subject: [PATCH] Bug 7537 - Implement TraceCompleteSubfields and TraceSubjectSubdivisions for NORMARC XSLT Content-Type: text/plain; charset="utf-8" As the title says, this patch implements TraceCompleteSubfields and TraceSubjectSubdivisions for NORMARC XSLT, both for the OPAC and the Intranet. This affects how clickable subject-links are constructed. To test: Find a record with a complex subject, like "Art -- United States". MARC21 and NORMARC are very similar in how they handle subjects, so testing on a MARC21 database should be OK. Make sure you have these syspref settings: - marcflavour = NORMARC - XSLTDetailsDisplay = using XSLT stylesheets - OPACXSLTDetailsDisplay = using XSLT stylesheets Now try the different combinations of TraceCompleteSubfields and TraceSubjectSubdivisions and check the format of the clickable links, both in the OPAC and staff client. Here's what you should be seeing: 1. TraceCompleteSubfields = Don't force TraceSubjectSubdivisions = Don't include -> q=su:{Art} 2. TraceCompleteSubfields = Force TraceSubjectSubdivisions = Don't include -> q=su,complete-subfield:{Art} 3. TraceCompleteSubfields = Don't force TraceSubjectSubdivisions = Include -> q=(su:{Art}) and (su:{United%20States.}) 4. TraceCompleteSubfields = Force TraceSubjectSubdivisions = Include -> q=(su,complete-subfield:{Art}) and (su,complete-subfield:{United States.}) --- .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 22 +++++++++++++++--- .../prog/en/xslt/NORMARCslimUtils.xsl | 4 ++- .../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 24 ++++++++++++++++--- .../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 4 ++- 4 files changed, 44 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl index 163ed29..b9f6da6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl @@ -15,6 +15,8 @@ + ,complete-subfield + @@ -293,16 +295,27 @@ + + - Emner: + Emne(r): - + /cgi-bin/koha/catalogue/search.pl?q=an: + + /cgi-bin/koha/catalogue/search.pl?q= + abcdvxyz + and + (su:{ + }) + + + - /cgi-bin/koha/catalogue/search.pl?q=su: + /cgi-bin/koha/catalogue/search.pl?q=su:{} @@ -313,7 +326,8 @@ -- - + + | diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl index 7c2bf21..606727e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl @@ -24,13 +24,15 @@ + + - + diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl index 1a4e042..eefaddd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl @@ -15,6 +15,10 @@ + + + ,complete-subfield + @@ -298,16 +302,27 @@ + + - Emner: + Emne(r): - + /cgi-bin/koha/opac-search.pl?q=an: + + /cgi-bin/koha/opac-search.pl?q= + abcdvxyz + and + (su:{ + }) + + + - /cgi-bin/koha/opac-search.pl?q=su: + /cgi-bin/koha/opac-search.pl?q=su:{} @@ -318,7 +333,8 @@ -- - + + | diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl index 31317b1..91a0437 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl @@ -25,13 +25,15 @@ + + - + -- 1.7.2.5