#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
# perldoc at the end of the file, per convention.
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use Exporter;
use Data::Dumper;
use C4::VirtualShelves qw/:DEFAULT ShelvesMax/;
use C4::Biblio;
use C4::Items;
+use C4::Reserves;
use C4::Koha;
use C4::Auth qw/get_session/;
use C4::Members;
use C4::Csv;
use C4::XSLT;
+use Koha::Virtualshelves;
+
use constant VIRTUALSHELVES_COUNT => 20;
use vars qw($debug @EXPORT @ISA $VERSION);
$debug = $ENV{DEBUG} || 0;
}
+my @messages;
our %pages = (
intranet => { redirect => '/cgi-bin/koha/virtualshelves/shelves.pl', },
opac => { redirect => '/cgi-bin/koha/opac-shelves.pl', },
loggedinuser => $loggedinuser,
OpacAllowPublicListCreation => C4::Context->preference('OpacAllowPublicListCreation'),
);
- my $edit;
my $shelves;
my @paramsloop;
my $totitems;
my ( $shelflimit, $shelfoffset, $shelveslimit, $shelvesoffset );
my $marcflavour = C4::Context->preference("marcflavour");
- # get biblionumbers stored in the cart
- my @cart_list;
- my $cart_cookie = ( $type eq 'opac' ? "bib_list" : "intranet_bib_list" );
- if($query->cookie($cart_cookie)){
- my $cart_list = $query->cookie($cart_cookie);
- @cart_list = split(/\//, $cart_list);
+ unless ( $query->param('print') ) {
+ $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') );
+ $shelflimit = $shelflimit || ShelvesMax('MGRPAGE');
+ $shelflimit = undef if $query->param('rss');
+ $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at
+ $shelveslimit = $shelflimit; # Limits number of shelves returned for a given query (row_count)
+ $shelvesoffset = ( $shelfoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving shelves at (offset)
}
- $shelflimit = ( $type eq 'opac' ? C4::Context->preference('OPACnumSearchResults') : C4::Context->preference('numSearchResults') );
- $shelflimit = $shelflimit || ShelvesMax('MGRPAGE');
- $shelfoffset = ( $itemoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving items at
- $shelveslimit = $shelflimit; # Limits number of shelves returned for a given query (row_count)
- $shelvesoffset = ( $shelfoff - 1 ) * $shelflimit; # Sets the offset to begin retrieving shelves at (offset)
- # getting the Shelves list
+ # getting the Shelves list
my $category = ( ( $displaymode eq 'privateshelves' ) ? 1 : 2 );
- my ( $shelflist, $totshelves ) = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser );
+ my $shelflist = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser );
+ my $totshelves = C4::VirtualShelves::GetShelfCount( $loggedinuser, $category );
- #Get a list of private shelves for possible deletion. Only do this when we've defaulted to public shelves
- my ( $privshelflist, $privtotshelves );
- if ( $category == 2 ) {
- ( $privshelflist, $privtotshelves ) = GetShelves( 1, $shelveslimit, $shelvesoffset, $loggedinuser );
- }
my $op = $query->param('op');
# the format of this is unindented for ease of diff comparison to the old script
$item = GetItem( 0, $barcode);
if (defined $item && $item->{'itemnumber'}) {
$biblio = GetBiblioFromItemNumber( $item->{'itemnumber'} );
- AddToShelf( $biblio->{'biblionumber'}, $shelfnumber, $loggedinuser)
+ Koha::Virtualshelves->find( $shelfnumber )->add_biblio( $biblio->{biblionumber}, $loggedinuser )
or push @paramsloop, { duplicatebiblio => $barcode };
}
else {
elsif(grep { /REM-(\d+)/ } $query->param) {
#remove item(s) from shelf
if(ShelfPossibleAction($loggedinuser, $shelfnumber, 'delete')) {
- #This is just a general okay; DelFromShelf checks further
my @bib;
foreach($query->param) {
/REM-(\d+)/ or next;
push @bib, $1; #$1 is biblionumber
}
- my $t= DelFromShelf(\@bib, $shelfnumber, $loggedinuser);
- if($t==0) {
+ my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+ my $number_of_biblios_removed = $shelf->remove_biblios( { biblionumbers => \@bib, borrowernumber => $loggedinuser } );
+ if( $number_of_biblios_removed == 0) {
push @paramsloop, {nothingdeleted => $shelfnumber};
}
- elsif($t<@bib) {
+ elsif( $number_of_biblios_removed < @bib ) {
push @paramsloop, {somedeleted => $shelfnumber};
}
}
push @paramsloop, { nopermission => $shelfnumber };
last SWITCH;
}
- my $shelf = {
- shelfname => $query->param('shelfname'),
- sortfield => $query->param('sortfield'),
- allow_add => $query->param('allow_add'),
- allow_delete_own => $query->param('allow_delete_own'),
- allow_delete_other => $query->param('allow_delete_other'),
- };
- if($query->param('category')) { #optional
- $shelf->{category}= $query->param('category');
+ my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+ $shelf->shelfname($query->param('shelfname'));
+ $shelf->sortfield($query->param('sortfield'));
+ $shelf->allow_add($query->param('allow_add'));
+ $shelf->allow_delete_own($query->param('allow_delete_own'));
+ $shelf->allow_delete_other($query->param('allow_delete_other'));
+ if( my $category = $query->param('category')) { #optional
+ $shelf->category($category);
}
- unless(ModShelf($shelfnumber, $shelf )) {
+ eval { $shelf->store };
+ if ( $@ ) {
push @paramsloop, {modifyfailure => $shelf->{shelfname}};
last SWITCH;
}
}
#Editing a shelf
elsif ( $op eq 'modif' ) {
- my ( $shelfnumber2, $shelfname, $owner, $category, $sortfield, $allow_add, $allow_delete_own, $allow_delete_other) = GetShelf($shelfnumber);
- my $member = GetMember( 'borrowernumber' => $owner );
+ my $shelf = Koha::Virtualshelves->find( $shelfnumber );
+ my $member = GetMember( 'borrowernumber' => $shelf->owner );
my $ownername = defined($member) ? $member->{firstname} . " " . $member->{surname} : '';
- $edit = 1;
$template->param(
edit => 1,
display => $displaymode,
- shelfnumber => $shelfnumber2,
- shelfname => $shelfname,
- owner => $owner,
+ shelfnumber => $shelf->shelfnumber,
+ shelfname => $shelf->shelfname,
+ owner => $shelf->owner,
ownername => $ownername,
- "category$category" => 1,
- category => $category,
- sortfield => $sortfield,
- allow_add => $allow_add,
- allow_delete_own => $allow_delete_own,
- allow_delete_other => $allow_delete_other,
+ "category".$shelf->category => 1,
+ category => $shelf->category,
+ sortfield => $shelf->sortfield,
+ allow_add => $shelf->allow_add,
+ allow_delete_own => $shelf->allow_delete_own,
+ allow_delete_other => $shelf->allow_delete_other,
);
}
last SWITCH;
#View a shelf
if ( $shelfnumber = $query->param('viewshelf') ) {
- # explicitly fetch this shelf
- my ($shelfnumber2,$shelfname,$owner,$category,$sorton) = GetShelf($shelfnumber);
-
- $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+ my $shelf = Koha::Virtualshelves->find( $shelfnumber );
if (C4::Context->preference('TagsEnabled')) {
$template->param(TagsEnabled => 1);
foreach (qw(TagsShowOnList TagsInputOnList)) {
if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
my $items;
my $tag_quantity;
- my $sortfield = ( $sorton ? $sorton : 'title' );
- ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield );
+ my $sortfield = ( $shelf->sortfield ? $shelf->sortfield : 'title' );
+ $sortfield = $query->param('sort') || $sortfield; ## Passed in sorting overrides default sorting
+ my $direction = $query->param('direction') || 'asc';
+ $template->param(
+ sort => $sortfield,
+ direction => $direction,
+ );
+ ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset, $sortfield, $direction );
+
+ # get biblionumbers stored in the cart
+ # Note that it's not use at the intranet
+ my @cart_list;
+ my $cart_cookie = ( $type eq 'opac' ? "bib_list" : "intranet_bib_list" );
+ if($query->cookie($cart_cookie)){
+ my $cart_list = $query->cookie($cart_cookie);
+ @cart_list = split(/\//, $cart_list);
+ }
+
+ my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
+
for my $this_item (@$items) {
my $biblionumber = $this_item->{'biblionumber'};
my $record = GetMarcBiblio($biblionumber);
- $this_item->{XSLTBloc} =
- XSLTParse4Display($biblionumber, $record, "OPACXSLTResultsDisplay")
- if C4::Context->preference("OPACXSLTResultsDisplay") && $type eq 'opac';
+ if (C4::Context->preference("OPACXSLTResultsDisplay") && $type eq 'opac') {
+ $this_item->{XSLTBloc} = XSLTParse4Display($biblionumber, $record, "OPACXSLTResultsDisplay");
+ } elsif (C4::Context->preference("XSLTResultsDisplay") && $type eq 'intranet') {
+ $this_item->{XSLTBloc} = XSLTParse4Display($biblionumber, $record, "XSLTResultsDisplay");
+ }
# the virtualshelfcontents table does not store these columns nor are they retrieved from the items
# and itemtypes tables, so I'm commenting them out for now to quiet the log -crn
#$this_item->{imageurl} = $imgdir."/".$itemtypes->{ $this_item->{itemtype} }->{'imageurl'};
#$this_item->{'description'} = $itemtypes->{ $this_item->{itemtype} }->{'description'};
$this_item->{'dateadded'} = format_date( $this_item->{'dateadded'} );
- $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'} )->{'imageurl'};
+ $this_item->{'imageurl'} = getitemtypeinfo( $this_item->{'itemtype'}, $type )->{'imageurl'};
$this_item->{'coins'} = GetCOinSBiblio( $record );
$this_item->{'subtitle'} = GetRecordValue('subtitle', $record, GetFrameworkCode($this_item->{'biblionumber'}));
$this_item->{'normalized_upc'} = GetNormalizedUPC( $record,$marcflavour);
$this_item->{'normalized_ean'} = GetNormalizedEAN( $record,$marcflavour);
$this_item->{'normalized_oclc'} = GetNormalizedOCLCNumber($record,$marcflavour);
$this_item->{'normalized_isbn'} = GetNormalizedISBN(undef,$record,$marcflavour);
+ if(!defined($this_item->{'size'})) { $this_item->{'size'} = "" }; #TT has problems with size
# Getting items infos for location display
my @items_infos = &GetItemsLocationInfo( $this_item->{'biblionumber'});
$this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} );
});
}
+ $this_item->{'allow_onshelf_holds'} = C4::Reserves::OnShelfHoldsAllowed($this_item, $borrower);
}
- push @paramsloop, { display => 'privateshelves' } if $category == 1;
+ if($type eq 'intranet'){
+ # Build drop-down list for 'Add To:' menu...
+ my ($totalref, $pubshelves, $barshelves)=
+ C4::VirtualShelves::GetSomeShelfNames($loggedinuser,'COMBO',1);
+ $template->param(
+ addbarshelves => $totalref->{bartotal},
+ addbarshelvesloop => $barshelves,
+ addpubshelves => $totalref->{pubtotal},
+ addpubshelvesloop => $pubshelves,
+ );
+ }
+ push @paramsloop, { display => 'privateshelves' } if $shelf->category == 1;
$showadd = 1;
my $i = 0;
my $manageshelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'manage' );
+ my $can_delete_shelf = ShelfPossibleAction( $loggedinuser, $shelfnumber, 'delete_shelf' );
$template->param(
- shelfname => $shelfname,
+ shelfname => $shelf->shelfname,
shelfnumber => $shelfnumber,
viewshelf => $shelfnumber,
sortfield => $sortfield,
manageshelf => $manageshelf,
allowremovingitems => ShelfPossibleAction( $loggedinuser, $shelfnumber, 'delete'),
allowaddingitem => ShelfPossibleAction( $loggedinuser, $shelfnumber, 'add'),
- "category$category" => 1,
- category => $category,
+ allowdeletingshelf => $can_delete_shelf,
+ "category".$shelf->category => 1,
+ category => $shelf->category,
itemsloop => $items,
- showprivateshelves => $category==1,
+ showprivateshelves => $shelf->category==1,
);
} else {
push @paramsloop, { nopermission => $shelfnumber };
if ( $query->param('shelves') ) {
my $stay = 1;
- #Add a shelf
- if ( my $newshelf = $query->param('addshelf') ) {
-
- # note: a user can always add a new shelf
- my $shelfnumber = AddShelf( {
- shelfname => $newshelf,
- sortfield => $query->param('sortfield'),
- category => $query->param('category'),
- allow_add => $query->param('allow_add'),
- allow_delete_own => $query->param('allow_delete_own'),
- allow_delete_other => $query->param('allow_delete_other'),
- },
- $query->param('owner') );
- $stay = 1;
- if ( $shelfnumber == -1 ) { #shelf already exists.
+ #Add a shelf
+ my $shelfname = $query->param('addshelf');
+
+ if ( $shelfname ) {
+
+ # note: a user can always add a new shelf (except database administrator account)
+ my $shelf = eval {
+ Koha::Virtualshelf->new(
+ {
+ shelfname => $shelfname,
+ sortfield => $query->param('sortfield'),
+ category => $query->param('category'),
+ allow_add => $query->param('allow_add'),
+ allow_delete_own => $query->param('allow_delete_own'),
+ allow_delete_other => $query->param('allow_delete_other'),
+ owner => $query->param('owner'),
+ }
+ )->store;
+ };
+ if ( $@ ) {
+ $showadd = 1;
+ push @messages, { type => 'error', code => ref($@) };
+ } elsif ( not $shelf ) {
$showadd = 1;
- push @paramsloop, { already => $newshelf };
- $template->param( shelfnumber => $shelfnumber );
+ push @messages, { type => 'error', 'error_on_insert' };
} else {
print $query->redirect( $pages{$type}->{redirect} . "?viewshelf=$shelfnumber" );
exit;
}
+
+ $template->param(
+ shelfname => $shelfname,
+ );
+ $stay = 1;
}
#Deleting a shelf (asking for confirmation if it has entries)
foreach ( $query->param() ) {
- /DEL-(\d+)/ or next;
+ /(DEL|REMSHR)-(\d+)/ or next;
$delflag = 1;
- my $number = $1;
- unless ( defined $shelflist->{$number} || defined $privshelflist->{$number} ) {
+ my $number = $2;
+ unless ( defined $shelflist->{$number} ) {
push( @paramsloop, { unrecognized => $number } );
last;
}
- unless ( ShelfPossibleAction( $loggedinuser, $number, 'manage' ) ) {
+ #remove a share
+ if(/REMSHR/) {
+ my $shelf = Koha::Virtualshelves->find( $number );
+ $shelf->delete_share( $loggedinuser );
+ delete $shelflist->{$number} if exists $shelflist->{$number};
+ $stay=0;
+ next;
+ }
+
+ my $can_manage = ShelfPossibleAction( $loggedinuser, $number, 'manage' );
+ my $can_delete = ShelfPossibleAction( $loggedinuser, $number, 'delete_shelf' );
+ unless ( $can_manage or $can_delete ) {
push( @paramsloop, { nopermission => $shelfnumber } );
last;
}
my $contents;
( $contents, $totshelves ) = GetShelfContents( $number, $shelveslimit, $shelvesoffset );
- if ( my $count = scalar @$contents ) {
+ if ( $totshelves > 0 ) {
unless ( scalar grep { /^CONFIRM-$number$/ } $query->param() ) {
if ( defined $shelflist->{$number} ) {
- push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $count, single => ($count eq 1 ? 1:0) } );
+ push( @paramsloop, { need_confirm => $shelflist->{$number}->{shelfname}, count => $totshelves, single => ($totshelves eq 1 ? 1:0) } );
$shelflist->{$number}->{confirm} = $number;
- } else {
- push( @paramsloop, { need_confirm => $privshelflist->{$number}->{shelfname}, count => $count } );
- $privshelflist->{$number}->{confirm} = $number;
}
$stay = 0;
next;
if ( defined $shelflist->{$number} ) {
$name = $shelflist->{$number}->{'shelfname'};
delete $shelflist->{$number};
- } else {
- $name = $privshelflist->{$number}->{'shelfname'};
- delete $privshelflist->{$number};
}
- unless ( DelShelf($number) ) {
+ unless( Koha::Virtualshelves->find($number)->delete ) {
push( @paramsloop, { delete_fail => $name } );
last;
}
my $numberCanManage = 0;
# rebuild shelflist in case a shelf has been added
- ( $shelflist, $totshelves ) = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser ) unless $delflag;
+ $shelflist = GetShelves( $category, $shelveslimit, $shelvesoffset, $loggedinuser ) unless $delflag;
+ $totshelves = C4::VirtualShelves::GetShelfCount( $loggedinuser, $category ) unless $delflag;
foreach my $element ( sort { lc( $shelflist->{$a}->{'shelfname'} ) cmp lc( $shelflist->{$b}->{'shelfname'} ) } keys %$shelflist ) {
my %line;
$shelflist->{$element}->{shelf} = $element;
my $category = $shelflist->{$element}->{'category'};
my $owner = $shelflist->{$element}->{'owner'}||0;
my $canmanage = ShelfPossibleAction( $loggedinuser, $element, 'manage' );
+ my $candelete = ShelfPossibleAction( $loggedinuser, $element, 'delete_shelf' );
$shelflist->{$element}->{"viewcategory$category"} = 1;
$shelflist->{$element}->{manageshelf} = $canmanage;
+ $shelflist->{$element}->{allowdeletingshelf} = $candelete;
if($canmanage || ($loggedinuser && $owner==$loggedinuser)) {
$shelflist->{$element}->{'mine'} = 1;
}
$shelflist->{$element}->{ownername} = defined($member) ? $member->{firstname} . " " . $member->{surname} : '';
$numberCanManage++ if $canmanage; # possibly outmoded
if ( $shelflist->{$element}->{'category'} eq '1' ) {
+ my $shelf = Koha::Virtualshelves->find( $element );
+ $shelflist->{$element}->{shares} = $shelf->is_shared;
push( @shelveslooppriv, $shelflist->{$element} );
} else {
push( @shelvesloop, $shelflist->{$element} );
my $url = $type eq 'opac' ? "/cgi-bin/koha/opac-shelves.pl" : "/cgi-bin/koha/virtualshelves/shelves.pl";
my %qhash = ();
- foreach (qw(display viewshelf sortfield)) {
+ foreach (qw(display viewshelf sortfield sort direction)) {
$qhash{$_} = $query->param($_) if $query->param($_);
}
( scalar keys %qhash ) and $url .= '?' . join '&', map { "$_=$qhash{$_}" } keys %qhash;
- if ( $shelfnumber && $totitems ) {
- $template->param( pagination_bar => pagination_bar( $url, ( int( $totitems / $shelflimit ) ) + ( ( $totitems % $shelflimit ) > 0 ? 1 : 0 ), $itemoff, "itemoff" ) );
- } elsif ( $totshelves ) {
- $template->param(
- pagination_bar => pagination_bar( $url, ( int( $totshelves / $shelveslimit ) ) + ( ( $totshelves % $shelveslimit ) > 0 ? 1 : 0 ), $shelfoff, "shelfoff" ) );
+ if ( $shelflimit ) {
+ if ( $shelfnumber && $totitems ) {
+ $template->param( pagination_bar => pagination_bar( $url, ( int( $totitems / $shelflimit ) ) + ( ( $totitems % $shelflimit ) > 0 ? 1 : 0 ), $itemoff, "itemoff" ) );
+ } elsif ( $totshelves ) {
+ $template->param(
+ pagination_bar => pagination_bar( $url, ( int( $totshelves / $shelveslimit ) ) + ( ( $totshelves % $shelveslimit ) > 0 ? 1 : 0 ), $shelfoff, "shelfoff" ) );
+ }
}
+
$template->param(
shelveslooppriv => \@shelveslooppriv,
shelvesloop => \@shelvesloop,
shelvesloopall => [ ( @shelvesloop, @shelveslooppriv ) ],
numberCanManage => $numberCanManage,
"BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
- csv_profiles => GetCsvProfilesLoop()
+ csv_profiles => GetCsvProfilesLoop('marc')
);
- if ( $shelfnumber
- or $shelves
- or $edit ) {
- $template->param( vseflag => 1 );
- }
- if ($shelves or # note: this part looks duplicative, but is intentional
- $edit
- ) {
- $template->param( seflag => 1 );
- #This hack is just another argument for refactoring this script one day
- #At this point you are adding or editing a list; if you add, then you add a private list (by default) with permissions as below; if you edit, do not pass these permissions, they must come from the database
- $template->param( allow_add => 0, allow_delete_own => 1, allow_delete_other => 0) unless $shelfnumber;
- }
#Next call updates the shelves for the Lists button.
#May not always be needed (when nothing changed), but doesn't take much.
barshelvesloop => $barshelves,
pubshelves => $total->{pubtotal},
pubshelvesloop => $pubshelves,
+ messages => \@messages,
);
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff