X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-addbybiblionumber.pl;h=b1bf2245c5b630f364cba2806c278f9768d3faca;hb=b06a289173d0f2e299b0c8652d59d47dc196062c;hp=304c2b49ddb06c4cf4d69308e13dfe572982a940;hpb=9971756a24e70101b2fb92833afab974d57ac4b9;p=koha_gimpoz
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 304c2b49dd..b1bf2245c5 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -18,19 +18,34 @@
# 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.
use strict;
+use warnings;
+
use C4::Biblio;
use CGI;
-use C4::VirtualShelves;
+use C4::VirtualShelves qw/:DEFAULT GetRecentShelves RefreshShelvesSummary/;
use C4::Auth;
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){
+ AddToShelf($bib, $shelfnumber);
+ }
+}
+
my $query = new CGI;
my @biblionumber = $query->param('biblionumber');
my $selectedshelf = $query->param('selectedshelf');
@@ -44,15 +59,16 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
template_name => "opac-addbybiblionumber.tmpl",
query => $query,
type => "opac",
- authnotrequired => 1,
+ authnotrequired =>( C4::Context->preference("OpacPublic") ? 1 : 0 ),
}
);
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 (