X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=offline_circ%2Fenqueue_koc.pl;h=57ae38c86e96206a60889ec1a799d97ea3cebeb6;hb=1fd17efba8631f91fde33525b9de42f10c58a95a;hp=bfc1e35ddb971826f5416765c47e32d2c2824227;hpb=f7644ec91f2d151535f8f5125c4057a9213d766e;p=koha.git

diff --git a/offline_circ/enqueue_koc.pl b/offline_circ/enqueue_koc.pl
index bfc1e35ddb..57ae38c86e 100755
--- a/offline_circ/enqueue_koc.pl
+++ b/offline_circ/enqueue_koc.pl
@@ -4,24 +4,24 @@
 
 # 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>.
 #
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Output;
 use C4::Auth;
 use C4::Koha;
@@ -32,7 +32,9 @@ use C4::Circulation;
 use C4::Items;
 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 );
 
@@ -45,7 +47,7 @@ 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,
@@ -60,9 +62,10 @@ my $sessionID = $cookies{'CGISESSID'}->value;
 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 +191,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;
 }