From bbd71abaeeeb092ac2fdcb1af53a95ab49144809 Mon Sep 17 00:00:00 2001 From: Elliott Davis 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.= "$homebranch". - "$status". - "".$itemcallnumber."" - . ""; - + "$location". + "$status". + "".$itemcallnumber."" + . ""; + } $xml = "".$xml.""; 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 @@ () - No copies available + No copies available - - Copies available for loan: - - - - [] - ( - - ) -. , - + + + + Copy available for loan at Copies available for loan at + + + + + . , + @@ -1002,15 +1001,14 @@ - Copies available for reference: - + + Copy available for reference at Copies available for reference at + + - [] - ( - - ) . , @@ -1061,6 +1059,27 @@ ). + + Location(s): + + + + + . , + + | + + + + + . , + + + + + -- 1.7.2.5