Attachment 9701 Details for Bug 7441 – Bug 7441 - search results showing wrong branch - Part 3 - Control display of branch via system preference

[patch] Bug 7441 - search results showing wrong branch - Part 3 - Control display of branch via system preference

Bug-7441---search-results-showing-wrong-branch---P.patch (text/plain), 11.61 KB, created by Kyle M Hall on 2012-05-22 13:42:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall

Created: 2012-05-22 13:42:07 UTC

Size: 11.61 KB

patch

obsolete

>From e300acadab6fde6422e629b2367dd4d58ff71caf Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Tue, 22 May 2012 09:00:30 -0400
>Subject: [PATCH] Bug 7441 - search results showing wrong branch - Part 3 - Control display of branch via system preference
>
>---
> C4/XSLT.pm | 2 +-
> installer/data/mysql/sysprefs.sql | 1 +
> installer/data/mysql/updatedatabase.pl | 7 ++
> .../prog/en/modules/admin/preferences/opac.pref | 7 ++
> .../prog/en/xslt/MARC21slim2OPACResults.xsl | 66 ++++++++++++++------
> 5 files changed, 63 insertions(+), 20 deletions(-)
>
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index 6ca2ea1..58197ec 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -187,7 +187,7 @@ sub XSLTParse4Display {
> OPACBaseURL TraceCompleteSubfields UseICU
> UseAuthoritiesForTracings TraceSubjectSubdivisions
> Display856uAsImage OPACDisplay856uAsImage 
>- UseControlNumber
>+ UseControlNumber ResultsBranchXSLT
> AlternateHoldingsField AlternateHoldingsSeparator / )
> {
> my $sp = C4::Context->preference( $syspref );
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 1edf08e..523b3b5 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -363,3 +363,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES (
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('OpacStarRatings','all',NULL,'disable|all|details','Choice');
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacBrowseResults','1','Disable/enable browsing and paging search results from the OPAC detail page.',NULL,'YesNo');
> INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SvcMaxReportRows','10','Maximum number of rows to return via the report web service.',NULL,'Integer');
>+INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACResultsBranchXSLT', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice');
>\ No newline at end of file
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 38aa70c..dab8010 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -5246,6 +5246,13 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
> SetVersion($DBversion);
> }
> 
>+$DBversion = "3.09.00.XXX";
>+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>+ $dbh->do("INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('OPACResultsBranchXSLT', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice')");
>+ print "Upgrade to $DBversion done (Adds permissions flag for access to the patron modifications tool)\n";
>+ SetVersion($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 TableExists($table)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index eb74d81..49388ba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -73,6 +73,13 @@ OPAC:
> no: "don't show"
> - icons for itemtype and authorized values.
> -
>+ - On search result pages displayed with XSLT stylesheets on the OPAC, show the item's
>+ - pref: OPACResultsBranchXSLT
>+ choices:
>+ holdingbranch: "holding branch"
>+ homebranch: "home branch"
>+ - icons for itemtype and authorized values.
>+ -
> - pref: COinSinOPACResults
> choices:
> yes: Include
>diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
>index cd7790a..d301368 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
>@@ -9,7 +9,12 @@
> <xsl:import href="MARC21slimUtils.xsl"/>
> <xsl:output method = "xml" indent="yes" omit-xml-declaration = "yes" />
> <xsl:key name="item-by-status" match="items:item" use="items:status"/>
>- <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:holdingbranch)"/>
>+ <xsl:if test="$OPACResultsBranchXSLT='holdingbranch'">
>+ <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:holdingbranch)"/>
>+ </xsl:if>
>+ <xsl:if test="$OPACResultsBranchXSLT='homebranch'">
>+ <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
>+ </xsl:if>
> 
> <xsl:template match="/">
> <xsl:apply-templates/>
>@@ -1014,14 +1019,26 @@
> <xsl:text>Copies available for loan: </xsl:text>
> <xsl:variable name="available_items"
> select="key('item-by-status', 'available')"/>
>- <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch))[1])]">
>- <xsl:value-of select="items:holdingbranch"/>
>-						 <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>- <xsl:text> (</xsl:text>
>- <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch)))"/>
>- <xsl:text>)</xsl:text>
>-<xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
>- </xsl:for-each>
>+ <xsl:if test="$OPACResultsBranchXSLT='holdingbranch'">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch))[1])]">
>+ <xsl:value-of select="items:holdingbranch"/>
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch)))"/>
>+ <xsl:text>)</xsl:text>
>+ <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
>+ </xsl:for-each>
>+ </xsl:if>
>+ <xsl:if test="$OPACResultsBranchXSLT='homebranch'">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
>+ <xsl:value-of select="items:homebranch"/>
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
>+ <xsl:text>)</xsl:text>
>+ <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
>+ </xsl:for-each>
>+ </xsl:if>
> 
> </xsl:when>
> 				 </xsl:choose>
>@@ -1036,16 +1053,27 @@
> <xsl:when test="count(key('item-by-status', 'reference'))>0">
> 
> <xsl:text>Copies available for reference: </xsl:text>
>- <xsl:variable name="reference_items"
>- select="key('item-by-status', 'reference')"/>
>- <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch))[1])]">
>- <xsl:value-of select="items:holdingbranch"/>
>-						 <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>- <xsl:text> (</xsl:text>
>- <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch)))"/>
>- <xsl:text>)</xsl:text>
>- <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
>- </xsl:for-each>
>+ <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
>+ <xsl:if test="$OPACResultsBranchXSLT='holdingbranch'">
>+ <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch))[1])]">
>+ <xsl:value-of select="items:holdingbranch"/>
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:holdingbranch)))"/>
>+ <xsl:text>)</xsl:text>
>+ <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
>+ </xsl:for-each>
>+ </xsl:if>
>+ <xsl:if test="$OPACResultsBranchXSLT='homebranch'">
>+ <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
>+ <xsl:value-of select="items:homebranch"/>
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
>+ <xsl:text>)</xsl:text>
>+ <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
>+ </xsl:for-each>
>+ </xsl:if>
> 
> </xsl:when>
> </xsl:choose>
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 7441: 8656 | 8657 | 9700 | 9701 | 12550 | 12551 | 12552 | 12553 | 13856 | 13888 | 14229 | 14361 | 14362 | 14977 | 14978 | 14979 | 17901 | 17902 | 17903 | 17968 | 18151 | 18152 | 18153 | 18154 | 18857 | 18858 | 18859 | 18942 | 19089 | 19090 | 19091 | 19470 | 19471 | 19472 | 19473 | 19474 | 19475 | 51963 | 52746 | 52747 | 52810 | 52811 | 54058 | 54101 | 54102 | 54250