Nick Clemens
4062116352
While this won't prevent the deadlock, it should catch the case where a deadlock causes the DB update to fail and provide feedback to the user and rollback the transaction I don't know how to trigger the deadlock, I can only confirm that we see it, and that this should catch it. To test: 1 - Apply patches 2 - Checkout several items to a patron 3 - Confirm that 'Renew all' feature continues to work as expected and all items are renewed Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
83 lines
2.5 KiB
Perl
Executable file
83 lines
2.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2014 ByWater Solutions
|
|
#
|
|
# 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 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.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI;
|
|
use JSON qw(to_json);
|
|
use Try::Tiny;
|
|
|
|
use C4::Circulation;
|
|
use C4::Context;
|
|
use C4::Auth qw(check_cookie_auth);
|
|
|
|
use Koha::DateUtils qw(output_pref dt_from_string);
|
|
|
|
my $input = CGI->new;
|
|
|
|
my ( $auth_status, $sessionID ) =
|
|
check_cookie_auth( $input->cookie('CGISESSID'),
|
|
{ circulate => 'circulate_remaining_permissions' } );
|
|
|
|
if ( $auth_status ne "ok" ) {
|
|
exit 0;
|
|
}
|
|
|
|
binmode STDOUT, ":encoding(UTF-8)";
|
|
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
|
|
|
|
my $itemnumber = $input->param('itemnumber');
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
my $override_limit = $input->param('override_limit');
|
|
my $branchcode = $input->param('branchcode')
|
|
|| C4::Context->userenv->{'branch'};
|
|
my $seen = $input->param('seen');
|
|
my $date_due;
|
|
if ( $input->param('date_due') ) {
|
|
$date_due = dt_from_string( scalar $input->param('date_due') );
|
|
}
|
|
|
|
my $data;
|
|
$data->{itemnumber} = $itemnumber;
|
|
$data->{borrowernumber} = $borrowernumber;
|
|
$data->{branchcode} = $branchcode;
|
|
|
|
( $data->{renew_okay}, $data->{error} ) =
|
|
CanBookBeRenewed( $borrowernumber, $itemnumber, $override_limit );
|
|
|
|
# If we're allowing reserved items to be renewed...
|
|
if ( $data->{error} && $data->{error} eq 'on_reserve' && C4::Context->preference('AllowRenewalOnHoldOverride')) {
|
|
$data->{renew_okay} = 1;
|
|
$data->{error} = undef;
|
|
}
|
|
|
|
if ( $data->{renew_okay} ) {
|
|
try{
|
|
$date_due = AddRenewal( $borrowernumber, $itemnumber, $branchcode, $date_due, undef, undef, $seen );
|
|
$data->{date_due} = output_pref( { dt => $date_due, as_due_date => 1 } );
|
|
} catch {
|
|
if ( ref($_) eq 'Koha::Exceptions::Checkout::FailedRenewal' ) {
|
|
$data->{error} = 'renewal_failed';
|
|
} else {
|
|
$_->rethrow;
|
|
}
|
|
};
|
|
}
|
|
|
|
print to_json($data);
|