X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=offline_circ%2Fenqueue_koc.pl;h=e10df9545d9edd2382efd02da0b40ec184062788;hb=8b714dc30c6c9440bbe9564d57fabb255070b64e;hp=bfc1e35ddb971826f5416765c47e32d2c2824227;hpb=8101d83af67f696fc12cc1830d9b51fd120ef6a4;p=koha-ffzg.git diff --git a/offline_circ/enqueue_koc.pl b/offline_circ/enqueue_koc.pl index bfc1e35ddb..e10df9545d 100755 --- a/offline_circ/enqueue_koc.pl +++ b/offline_circ/enqueue_koc.pl @@ -4,39 +4,34 @@ # 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 . # -use strict; -use warnings; +use Modern::Perl; -use CGI; -use C4::Output; -use C4::Auth; -use C4::Koha; +use CGI qw ( -utf8 ); +use C4::Output qw( output_html_with_http_headers ); +use C4::Auth qw( get_template_and_user ); use C4::Context; -use C4::Biblio; use C4::Accounts; -use C4::Circulation; -use C4::Items; +use C4::Circulation qw( AddOfflineOperation ); use C4::Members; use C4::Stats; -use C4::UploadedFile; +use Koha::Checkouts; +use Koha::UploadedFiles; +use Koha::Items; -use Date::Calc qw( Add_Delta_Days Date_to_Days ); - -use constant DEBUG => 0; # this is the file version number that we're coded against. my $FILE_VERSION = '1.0'; @@ -45,24 +40,22 @@ my $query = CGI->new; my @output; my ($template, $loggedinuser, $cookie) = get_template_and_user({ - template_name => "offline_circ/enqueue_koc.tmpl", + template_name => "offline_circ/enqueue_koc.tt", query => $query, type => "intranet", - authnotrequired => 0, flagsrequired => { circulate => "circulate_remaining_permissions" }, }); - my $fileID=$query->param('uploadedfileid'); -my %cookies = parse CGI::Cookie($cookie); -my $sessionID = $cookies{'CGISESSID'}->value; + ## 'Local' globals. our $dbh = C4::Context->dbh(); if ($fileID) { - my $uploaded_file = C4::UploadedFile->fetch($sessionID, $fileID); - my $fh = $uploaded_file->fh(); - my @input_lines = <$fh>; + my $upload = Koha::UploadedFiles->find($fileID); + my $fh = $upload? $upload->file_handle: undef; + my @input_lines = $fh? <$fh>: (); + $fh->close if $fh; my $header_line = shift @input_lines; my $file_info = parse_header_line($header_line); @@ -188,10 +181,10 @@ sub _get_borrowernumber_from_barcode { return unless $barcode; - my $item = GetBiblioFromItemNumber( undef, $barcode ); - return unless $item->{'itemnumber'}; + my $item = Koha::Items->find({ barcode => $barcode }); + return unless $item; - my $issue = C4::Circulation::GetItemIssue( $item->{'itemnumber'} ); - return unless $issue->{'borrowernumber'}; - return $issue->{'borrowernumber'}; + my $issue = Koha::Checkouts->find( { itemnumber => $item->itemnumber } ); + return unless $issue; + return $issue->borrowernumber; }