Bugzilla – Attachment 4523 Details for
Bug 5079
Make display of shelving location and call number in XSLT results controlled by sysprefs
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to add/remove shelving location in xslt opac-search
0001-Added-system-preference-to-display-shelving-location.patch (text/plain), 11.56 KB, created by
Elliott Davis
on 2011-06-26 21:08:54 UTC
(
hide
)
Description:
Patch to add/remove shelving location in xslt opac-search
Filename:
MIME Type:
Creator:
Elliott Davis
Created:
2011-06-26 21:08:54 UTC
Size:
11.56 KB
patch
obsolete
>From bbd71abaeeeb092ac2fdcb1af53a95ab49144809 Mon Sep 17 00:00:00 2001 >From: Elliott Davis <tdavis@uttyler.edu> >Date: Sun, 26 Jun 2011 10:52:09 -0500 >Subject: [PATCH] Added system preference to display shelving location of an item on opac results. The system preference is called OpacItemLocation. I also moved the call number to a new line called Location along with the shelving location if it is enabled. To Test: run database update script to add syspref. Enable OpacItemLocation to show locations on the opac-search page. If it is working you should see the shelving location of the item before the call number. Multiple home branch shelving locations are seperated by a |. > >--- > C4/XSLT.pm | 16 ++++-- > installer/data/mysql/en/mandatory/sysprefs.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 +++ > .../prog/en/modules/admin/preferences/opac.pref | 6 ++ > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 57 +++++++++++++------- > 5 files changed, 63 insertions(+), 24 deletions(-) > >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index 28a70fc..37dea46 100755 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -183,8 +183,10 @@ sub XSLTParse4Display { > sub buildKohaItemsNamespace { > my ($biblionumber) = @_; > my @items = C4::Items::GetItemsInfo($biblionumber); >+ my $shelflocations =GetKohaAuthorisedValues('items.location',GetFrameworkCode($biblionumber), 'opac'); > my $branches = GetBranches(); > my $itemtypes = GetItemTypes(); >+ my $location = ""; > my $xml = ''; > for my $item (@items) { > my $status; >@@ -223,12 +225,16 @@ sub buildKohaItemsNamespace { > $status = "available"; > } > my $homebranch = xml_escape($branches->{$item->{homebranch}}->{'branchname'}); >- my $itemcallnumber = xml_escape($item->{itemcallnumber}); >+ if(C4::Context->preference("OpacItemLocation") && defined $item->{'location'}) { >+ $location = xml_escape($shelflocations->{$item->{location}}); >+ } >+ my $itemcallnumber = xml_escape($item->{itemcallnumber}); > $xml.= "<item><homebranch>$homebranch</homebranch>". >- "<status>$status</status>". >- "<itemcallnumber>".$itemcallnumber."</itemcallnumber>" >- . "</item>"; >- >+ "<location>$location</location>". >+ "<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/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql >index f98b053..7419908 100755 >--- a/installer/data/mysql/en/mandatory/sysprefs.sql >+++ b/installer/data/mysql/en/mandatory/sysprefs.sql >@@ -92,6 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo'); >+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac',1,'If ON, globally enables patron holds on OPAC',NULL,'YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 3c7d043..c8bca2b 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -4354,6 +4354,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > SetVersion ($DBversion); > } > >+$DBversion = 'XXX'; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo');"); >+ print "Upgrade to $DBversion done (Add OpacItemLocation syspref)\n"; >+ SetVersion ($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 DropAllForeignKeys($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 71c9426..88aa7ca 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 >@@ -192,6 +192,12 @@ OPAC: > no: "Don't allow" > - patrons to log in to their accounts on the OPAC. > - >+ - pref: OpacItemLocation >+ choices: >+ yes: Show >+ no: "Don't Show" >+ - Show the shelving location of items in opac results. >+ - > - pref: OpacPasswordChange > choices: > yes: Allow >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index 97d83e2..5805aea 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -979,22 +979,21 @@ > </xsl:for-each> > (<xsl:value-of select="$AlternateHoldingsCount"/>) > </xsl:when> >- <xsl:otherwise>No copies available</xsl:otherwise> >+ <xsl:otherwise>No copies available </xsl:otherwise> > </xsl:choose> > </xsl:when> > <xsl:when test="count(key('item-by-status', 'available'))>0"> >- <span class="available"> >- <b><xsl:text>Copies available for loan: </xsl:text></b> >- <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: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> >+ <span class="available"> >+ <b> >+ <xsl:value-of select="count(key('item-by-status', 'available'))"/> >+ <xsl:choose><xsl:when test="count(key('item-by-status', 'available')) = 1"><xsl:text> Copy available for loan at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for loan at </xsl:text></xsl:otherwise></xsl:choose> >+ </b> >+ <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:value-of select="items:homebranch"/> >+ <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> > </span> > </xsl:when> > </xsl:choose> >@@ -1002,15 +1001,14 @@ > <xsl:choose> > <xsl:when test="count(key('item-by-status', 'reference'))>0"> > <span class="available"> >- <b><xsl:text>Copies available for reference: </xsl:text></b> >- <xsl:variable name="reference_items" >+ <b> >+ <xsl:value-of select="count(key('item-by-status', 'reference'))"/> >+ <xsl:choose><xsl:when test="count(key('item-by-status', 'reference')) = 1"><xsl:text> Copy available for reference at </xsl:text></xsl:when><xsl:otherwise><xsl:text> Copies available for reference at </xsl:text></xsl:otherwise></xsl:choose> >+ </b> >+ <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: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> > </span> >@@ -1061,6 +1059,27 @@ > <xsl:text>). </xsl:text> </span> > </xsl:if> > </span> >+ <span class="results_summary" id="location"> >+ <span class="label">Location(s): </span> >+ <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:value-of select="concat(items:location,' ')"/> >+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if> >+ <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:choose><xsl:when test="count(key('item-by-status', 'available'))>0 and count(key('item-by-status', 'reference'))>0"><xsl:text> | </xsl:text></xsl:when></xsl:choose> >+ <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:value-of select="concat(items:location,' ')"/> >+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> <xsl:value-of select="items:itemcallnumber"/></xsl:if> >+ <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> >+ >+ </span> >+ >+ > </xsl:template> > > <xsl:template name="nameABCDQ"> >-- >1.7.2.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5079
:
4523
|
4534
|
4543
|
4544
|
4545
|
4547
|
9296
|
9297
|
9298
|
9299
|
10912
|
10913
|
10929
|
12317
|
14355
|
14605