Attachment 52747 Details for Bug 7441 – Bug 7441 - search results showing wrong branch?

[patch] Bug 7441 - search results showing wrong branch?

Bug-7441---search-results-showing-wrong-branch.patch (text/plain), 24.94 KB, created by Nick Clemens (kidclamp) on 2016-06-23 16:53:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2016-06-23 16:53:54 UTC

Size: 24.94 KB

patch

obsolete

>From 4579f77a4d379cb8e6c4a878032db5e847519041 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 2 Jun 2016 14:01:56 +0000
>Subject: [PATCH] Bug 7441 - search results showing wrong branch?
>
>When you search in the OPAC it shows you the HOME branch on the location
>in XSLT, but if you click through to the detail page it shows you the
>CURRENT BRANCH in the holdings table which is very confusing to patrons.
>I don't know what's the right solution - home or holding branch, but they
>should be the same in both places for the patron's sake. If you do the same
>search in the staff client you see the right branch info on the search results
>and on the detail page.
>
>Test Plan:
>1) Apply this patch
>2) Run updatedatabase.pl
>3) Search the catalog, you search should include results with items
> that have different home and holding libraries.
>4) The results should look the same as before the patch
>5) Change the system preference OPACResultsLibrary to "current location"
>6) Refresh your page of search results
>7) The results show now show the holding library instead of the home library
>
>Signed-off-by: Barbara Walters <bwalters@ncrl.org>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> C4/XSLT.pm | 19 +++--
> installer/data/mysql/atomicupdate/bug_7441.sql | 2 +
> installer/data/mysql/sysprefs.sql | 1 +
> .../prog/en/modules/admin/preferences/opac.pref | 6 ++
> .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 89 +++++++++++++---------
> .../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 58 +++++++++-----
> 6 files changed, 116 insertions(+), 59 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_7441.sql
>
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index a2bbaab..19f643a 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -170,7 +170,8 @@ sub get_xslt_sysprefs {
> UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
> OPACItemLocation DisplayIconsXSLT
> AlternateHoldingsField AlternateHoldingsSeparator
>- TrackClicks opacthemes IdRef OpacSuppression / )
>+ TrackClicks opacthemes IdRef OpacSuppression
>+ OPACResultsLibrary / )
> {
> my $sp = C4::Context->preference( $syspref );
> next unless defined($sp);
>@@ -310,13 +311,15 @@ sub buildKohaItemsNamespace {
> $location = $item->{location}? xml_escape($shelflocations->{$item->{location}}||$item->{location}):'';
> $ccode = $item->{ccode}? xml_escape($ccodes->{$item->{ccode}}||$item->{ccode}):'';
> my $itemcallnumber = xml_escape($item->{itemcallnumber});
>- $xml.= "<item><homebranch>$homebranch</homebranch>".
>- "<holdingbranch>$holdingbranch</holdingbranch>".
>- "<location>$location</location>".
>- "<ccode>$ccode</ccode>".
>- "<status>$status</status>".
>- "<itemcallnumber>".$itemcallnumber."</itemcallnumber>".
>- "</item>";
>+ $xml .=
>+ "<item>"
>+ . "<homebranch>$homebranch</homebranch>"
>+ . "<holdingbranch>$holdingbranch</holdingbranch>"
>+ . "<location>$location</location>"
>+ . "<ccode>$ccode</ccode>"
>+ . "<status>$status</status>"
>+ . "<itemcallnumber>$itemcallnumber</itemcallnumber>"
>+ . "</item>";
> }
> $xml = "<items xmlns=\"http://www.koha-community.org/items\">".$xml."</items>";
> return $xml;
>diff --git a/installer/data/mysql/atomicupdate/bug_7441.sql b/installer/data/mysql/atomicupdate/bug_7441.sql
>new file mode 100644
>index 0000000..0177a79
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_7441.sql
>@@ -0,0 +1,2 @@
>+INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES
>+('OPACResultsLibrary', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice');
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 2b95c99..2da6350 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -333,6 +333,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('OpacRenewalAllowed','0',NULL,'If ON, users can renew their issues directly from their OPAC account','YesNo'),
> ('OpacRenewalBranch','checkoutbranch','itemhomebranch|patronhomebranch|checkoutbranch|null','Choose how the branch for an OPAC renewal is recorded in statistics','Choice'),
> ('OpacResetPassword','0','','Shows the ''Forgot your password?'' link in the OPAC','YesNo'),
>+('OPACResultsLibrary', 'homebranch', 'homebranch|holdingbranch', 'Defines whether the OPAC displays the holding or home branch in search results when using XSLT', 'Choice'),
> ('OPACResultsSidebar','','70|10','Define HTML to be included on the search results page, underneath the facets sidebar','Textarea'),
> ('OPACSearchForTitleIn','<li><a href=\"http://worldcat.org/search?q={TITLE}\" target=\"_blank\">Other Libraries (WorldCat)</a></li>\n<li><a href=\"http://www.scholar.google.com/scholar?q={TITLE}\" target=\"_blank\">Other Databases (Google Scholar)</a></li>\n<li><a href=\"http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr\" target=\"_blank\">Online Stores (Bookfinder.com)</a></li>\n<li><a href=\"http://openlibrary.org/search/?author=({AUTHOR})&title=({TITLE})\" target=\"_blank\">Open Library (openlibrary.org)</a></li>','70|10','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','Textarea'),
> ('OpacSeparateHoldings','0',NULL,'Separate current branch holdings from other holdings (OPAC)','YesNo'),
>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 e1c72f0..6154f7d 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
>@@ -1,6 +1,12 @@
> OPAC:
> Appearance:
> -
>+ - For search results in the OPAC, show the item's
>+ - pref: OPACResultsLibrary
>+ choices:
>+ holdingbranch: "current location"
>+ homebranch: "home library"
>+ -
> - Use the
> - pref: opacthemes
> choices: opac-templates
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>index 9b22fd5..dc66b3e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
>@@ -10,7 +10,8 @@
> <xsl:import href="MARC21slimUtils.xsl"/>
> <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
> <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:homebranch)"/>
>+ <xsl:key name="item-by-status-and-branch-home" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
>+ <xsl:key name="item-by-status-and-branch-holding" match="items:item" use="concat(items:status, ' ', items:holdingbranch)"/>
> 
> <xsl:template match="/">
> <xsl:apply-templates/>
>@@ -20,6 +21,7 @@
> 
> <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
> 
>+ <xsl:variable name="OPACResultsLibrary" select="marc:sysprefs/marc:syspref[@name='OPACResultsLibrary']"/>
> <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
> <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
> <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
>@@ -1166,35 +1168,54 @@
> <xsl:variable name="available_items"
> select="key('item-by-status', 'available')"/>
> <xsl:choose>
>- <xsl:when test="$singleBranchMode=1">
>- <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
>- 
>- <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [Call number: <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:when>
>- <xsl:otherwise>
>- <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 and $OPACItemLocation='callnum'"> [Call number: <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:otherwise>
>+ <xsl:when test="$singleBranchMode=1">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
>+ 
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [Call number: <xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch-home', 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:when>
>+ <xsl:otherwise>
>+ <xsl:choose>
>+ <xsl:when test="$OPACResultsLibrary='homebranch'">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
>+ 
>+ <xsl:value-of select="items:homebranch"/>
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'"> [Call number: <xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch-home', 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:when>
>+ <xsl:otherwise>
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
>+ 
>+ <xsl:value-of select="items:holdingbranch"/>
>+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'"> [Call number: <xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
>+ <xsl:text> (</xsl:text>
>+ <xsl:value-of select="count(key('item-by-status-and-branch-holding', 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:otherwise>
>+ </xsl:choose>
>+ </xsl:otherwise>
> </xsl:choose>
> 
> 
>@@ -1206,14 +1227,14 @@
> 
> <xsl:text>Items 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:homebranch))[1])]">
>+ <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
> 
> <xsl:if test="$singleBranchMode=0">
> <xsl:value-of select="items:homebranch"/>
> </xsl:if>
> <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [Call number: <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:value-of select="count(key('item-by-status-and-branch-home', 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>
> 
>@@ -1280,7 +1301,7 @@
> <xsl:when test="count(key('item-by-status', 'available'))>0">
> 
> <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:homebranch))[1])]">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
> <xsl:choose>
> <xsl:when test="$OPACItemLocation='location'"><xsl:value-of select="concat(items:location,' ')"/></xsl:when>
> <xsl:when test="$OPACItemLocation='ccode'"><xsl:value-of select="concat(items:ccode,' ')"/></xsl:when>
>@@ -1293,7 +1314,7 @@
> <xsl:when test="count(key('item-by-status', 'reference'))>0">
> 
> <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:homebranch))[1])]">
>+ <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
> <xsl:choose>
> <xsl:when test="$OPACItemLocation='location'"><xsl:value-of select="concat(items:location,' ')"/></xsl:when>
> <xsl:when test="$OPACItemLocation='ccode'"><xsl:value-of select="concat(items:ccode,' ')"/></xsl:when>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
>index d72ad3f..3c97177 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl
>@@ -11,7 +11,8 @@
> <xsl:import href="UNIMARCslimUtils.xsl"/>
> <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
> <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:homebranch)"/>
>+<xsl:key name="item-by-status-and-branch-home" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
>+<xsl:key name="item-by-status-and-branch-holding" match="items:item" use="concat(items:status, ' ', items:holdingbranch)"/>
> 
> <xsl:template match="/">
> <xsl:apply-templates/>
>@@ -25,6 +26,7 @@
> select="marc:datafield[@tag=090]/marc:subfield[@code='a']"/>
> <xsl:variable name="isbn"
> select="marc:datafield[@tag=010]/marc:subfield[@code='a']"/>
>+ <xsl:variable name="OPACResultsLibrary" select="marc:sysprefs/marc:syspref[@name='OPACResultsLibrary']"/>
> <xsl:variable name="BiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='BiblioDefaultView']"/>
> <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
> <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
>@@ -146,31 +148,53 @@
> <xsl:variable name="available_items" select="key('item-by-status', 'available')"/>
> <xsl:choose>
> <xsl:when test="$singleBranchMode=1">
>- <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
> <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:value-of select="count(key('item-by-status-and-branch-home', 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:when>
> <xsl:otherwise>
>- <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:choose>
>+ <xsl:when test="$OPACResultsLibrary='homebranch'">
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', 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-home', 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:when>
> <xsl:otherwise>
>- <xsl:text>, </xsl:text>
>+ <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', 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-holding', 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:otherwise>
> </xsl:choose>
>- </xsl:for-each>
> </xsl:otherwise>
> </xsl:choose>
> 
>@@ -182,13 +206,13 @@
> <xsl:text>Items 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:homebranch))[1])]">
>+ <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
> <xsl:if test="$singleBranchMode=0">
> <xsl:value-of select="items:homebranch"/>
> </xsl:if>
> <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:value-of select="count(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch)))"/>
> <xsl:text>)</xsl:text>
> <xsl:choose>
> <xsl:when test="position()=last()">
>-- 
>2.1.4

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