X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-addbybiblionumber.pl;h=4c99ed27271b89ace4a7276705cf49fe5fc76af2;hb=74308aa622218358ed12a496f52e97bb53ba9eda;hp=9fe02ee4fdf6569f6bf7934a27ecbbf18f73f549;hpb=8bbef6380ac99e01207ac4dbbbd3b085093e24e7;p=koha.git
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 9fe02ee4fd..4c99ed2727 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -23,6 +23,8 @@
# Suite 330, Boston, MA 02111-1307 USA
use strict;
+use warnings;
+
use C4::Biblio;
use CGI;
use C4::VirtualShelves qw/:DEFAULT GetRecentShelves RefreshShelvesSummary/;
@@ -31,6 +33,19 @@ use C4::Output;
use C4::Auth qw/get_session/;
use C4::Debug;
+#splits incoming biblionumber(s) to array and adds each to shelf.
+sub AddBibliosToShelf {
+ my ($shelfnumber,@biblionumber)=@_;
+
+ # multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
+ if (scalar(@biblionumber) == 1) {
+ @biblionumber = (split /\//,$biblionumber[0]);
+ }
+ for my $bib (@biblionumber){
+ AddToShelfFromBiblio($bib, $shelfnumber);
+ }
+}
+
my $query = new CGI;
my @biblionumber = $query->param('biblionumber');
my $selectedshelf = $query->param('selectedshelf');
@@ -50,9 +65,10 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
if ($newvirtualshelf) {
$shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category );
+ AddBibliosToShelf($shelfnumber, @biblionumber);
RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
print $query->header;
- print "";
+ print "";
exit;
}
@@ -62,20 +78,11 @@ if ($selectedshelf) {
$authorized = 0 unless ShelfPossibleAction( $loggedinuser, $selectedshelf );
}
-# multiple bibs might come in as '/' delimited string (from where, i don't see), or as array.
-
-my $multiple = 0;
-my @bibs;
-if (scalar(@biblionumber) == 1) {
- @biblionumber = (split /\//,$biblionumber[0]);
-}
if ($shelfnumber && ($shelfnumber != -1)) {
- for my $bib (@biblionumber){
- AddToShelfFromBiblio($bib,$shelfnumber);
- }
+ AddBibliosToShelf($shelfnumber,@biblionumber);
RefreshShelvesSummary($query->cookie("CGISESSID"),$loggedinuser,($loggedinuser == -1 ? 20 : 10));
print $query->header;
- print "";
+ print "";
exit;
}
else {
@@ -90,21 +97,17 @@ else {
);
} else {
# offer choice of shelves
- # first private shelves...
my $limit = 10;
- my ($shelflist) = GetRecentShelves(1, $limit, $loggedinuser);
my @shelvesloop;
my %shelvesloop;
- for my $shelf ( @{${@$shelflist}[0]} ) {
- push( @shelvesloop, $shelf->{shelfnumber} );
- $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
- }
- # then open shelves...
- my ($shelflist) = GetRecentShelves(3, $limit, undef);
- for my $shelf ( @{${@$shelflist}[0]} ) {
- push( @shelvesloop, $shelf->{shelfnumber} );
- $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
- }
+ # grab each type of shelf, open (type 3) should not be limited by user.
+ foreach my $shelftype (1,2,3) {
+ my ($shelflist) = GetRecentShelves($shelftype, $limit, $shelftype == 3 ? undef : $loggedinuser);
+ for my $shelf (@{ $shelflist->[0] }) {
+ push(@shelvesloop, $shelf->{shelfnumber});
+ $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname};
+ }
+ }
my $CGIvirtualshelves;
if ( @shelvesloop > 0 ) {
$CGIvirtualshelves = CGI::scrolling_list (