X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=virtualshelves%2Faddbybiblionumber.pl;h=f1ac67428ff5a5b1a523e4e0912e30400a78930e;hb=36efd0d4d0cfe5bbdcd9a4b48e0e417a59aaa63a;hp=fd3c2d6d44ca025f643fe1048ca01737efa4074f;hpb=1e842a8e64ff0a52761cf2b2961a9a5380ac1274;p=koha.git diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl index fd3c2d6d44..f1ac67428f 100755 --- a/virtualshelves/addbybiblionumber.pl +++ b/virtualshelves/addbybiblionumber.pl @@ -16,9 +16,9 @@ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. =head1 NAME @@ -50,11 +50,16 @@ if this script has to add a shelf, it add one with this category. +=item newshelf + + if this parameter exists, then we create a new shelf + =back =cut use strict; +#use warnings; FIXME - Bug 2505 use C4::Biblio; use CGI; use C4::Output; @@ -62,18 +67,17 @@ use C4::VirtualShelves qw/:DEFAULT GetRecentShelves/; use C4::Circulation; use C4::Auth; -#use it only to debug ! -use warnings; - +# 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. + # (Note : they come in as '/' when added from the cart) if (scalar(@biblionumber) == 1) { @biblionumber = (split /\//,$biblionumber[0]); } for my $bib (@biblionumber){ - AddToShelfFromBiblio($bib, $shelfnumber); + AddToShelf($bib, $shelfnumber); } } @@ -83,13 +87,16 @@ my $query = new CGI; my $biblionumber = $query->param('biblionumber'); # If set, then multiple item case. - +my @biblionumber = $query->param('biblionumber'); my $biblionumbers = $query->param('biblionumbers'); + my $shelfnumber = $query->param('shelfnumber'); my $newvirtualshelf = $query->param('newvirtualshelf'); +my $newshelf = $query->param('newshelf'); my $category = $query->param('category'); -my $confirmed = $query->param('confirmed'); -my $sortfield = $query->param('sortfield'); +my $sortfield = $query->param('sortfield'); +my $confirmed = $query->param('confirmed') || 0; + my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -107,12 +114,15 @@ if ($biblionumbers) { } else { @biblionumbers = (@biblionumber); } +if (scalar(@biblionumber) == 1) { + @biblionumber = (split /\//,$biblionumber[0]); +} -$shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category, $sortfield ) - if $newvirtualshelf; +$shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category, $sortfield ) if $newvirtualshelf; if ( $shelfnumber || ( $shelfnumber == -1 ) ) { # the shelf already exist. + if ($confirmed == 1) { - AddBibliosToShelf($shelfnumber,@biblionumbers); + AddBibliosToShelf($shelfnumber,@biblionumber); print "Content-Type: text/html\n\n"; exit; @@ -143,20 +153,20 @@ if ( $shelfnumber || ( $shelfnumber == -1 ) ) { # the shelf already exist. } else { # this shelf doesn't already exist. my $limit = 10; - my ($shelflist) = GetRecentShelves(1, $limit, $loggedinuser); + my ($shelflist); my @shelvesloop; my %shelvesloop; - for my $shelf ( @{ $shelflist->[0] } ) { - push( @shelvesloop, $shelf->{shelfnumber} ); - $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname}; - } - # then open shelves... - ($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 }) { + push(@shelvesloop, $shelf->{shelfnumber}); + $shelvesloop{$shelf->{shelfnumber}} = $shelf->{shelfname}; + } } - if(@shelvesloop gt 0){ + + if( @shelvesloop ){ my $CGIvirtualshelves = CGI::scrolling_list ( -name => 'shelfnumber', @@ -171,8 +181,23 @@ else { # this shelf doesn't already exist. CGIvirtualshelves => $CGIvirtualshelves, ); } - - unless ($biblionumbers) { + my @biblios; + for my $bib (@biblionumber) { + my $data = GetBiblioData( $bib ); + push(@biblios, + { biblionumber => $bib, + title => $data->{'title'}, + author => $data->{'author'}, + } ); + } + $template->param( + newshelf => $newshelf, + biblios=>\@biblios, + multiple => (scalar(@biblionumber) > 1), + total => scalar(@biblionumber), + ); + + unless (@biblionumbers) { my ( $bibliocount, @biblios ) = GetBiblio($biblionumber); $template->param