X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=virtualshelves%2Faddbybiblionumber.pl;h=f1ac67428ff5a5b1a523e4e0912e30400a78930e;hb=0cf2eccfe926f77753a2b948e2babf077e2975d3;hp=f81c2fec5b375353acf552afeef0a43bbad0e05f;hpb=b18661529f4866fbdf2459d52282cbca3422b245;p=koha.git

diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl
index f81c2fec5b..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
@@ -59,39 +59,25 @@
 =cut
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Biblio;
 use CGI;
 use C4::Output;
 use C4::VirtualShelves qw/:DEFAULT GetRecentShelves/;
 use C4::Circulation;
 use C4::Auth;
-#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);
-    }
-}
-
-
-
-#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);
     }
 }
 
@@ -128,6 +114,9 @@ if ($biblionumbers) {
 } else {
     @biblionumbers = (@biblionumber);
 }
+if (scalar(@biblionumber) == 1) {
+        @biblionumber = (split /\//,$biblionumber[0]);
+}
 
 $shelfnumber = AddShelf( $newvirtualshelf, $loggedinuser, $category, $sortfield ) if $newvirtualshelf;
 if ( $shelfnumber || ( $shelfnumber == -1 ) ) {    # the shelf already exist.
@@ -164,21 +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',