Bug 18789: (QA follow-up) Fix viewlog when accessed via circulation

[koha.git] / tools / stage-marc-import.pl

diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index e7e9954..f2acc58 100755 (executable)
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -24,8 +24,7 @@
 # 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; FIXME - Bug 2505
+use Modern::Perl;
 
 # standard or CPAN modules used
 use CGI qw ( -utf8 );
@@ -39,7 +38,7 @@ use C4::Output;
 use C4::Biblio;
 use C4::ImportBatch;
 use C4::Matcher;
-use Koha::Upload;
+use Koha::UploadedFiles;
 use C4::BackgroundJob;
 use C4::MarcModificationTemplates;
 use Koha::Plugins;
@@ -56,9 +55,8 @@ my $parse_items                = $input->param('parse_items');
 my $item_action                = $input->param('item_action');
 my $comments                   = $input->param('comments');
 my $record_type                = $input->param('record_type');
-my $encoding                   = $input->param('encoding') || 'utf8';
+my $encoding                   = $input->param('encoding') || 'UTF-8';
 my $format                     = $input->param('format') || 'ISO2709';
-my $to_marc_plugin             = $input->param('to_marc_plugin');
 my $marc_modification_template = $input->param('marc_modification_template_id');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -85,10 +83,22 @@ if ($completedJobID) {
     my $results = $job->results();
     $template->param(map { $_ => $results->{$_} } keys %{ $results });
 } elsif ($fileID) {
-    my $upload = Koha::Upload->new->get({ id => $fileID });
-    my $filename = $upload->{path};
-       my $marcrecord='';
-    my ($errors, $marcrecords) = C4::ImportBatch::RecordsFromISO2709File($uploaded_file->filename(), $record_type, $encoding);
+    my $upload = Koha::UploadedFiles->find( $fileID );
+    my $file = $upload->full_path;
+    my $filename = $upload->filename;
+
+    my ( $errors, $marcrecords );
+    if( $format eq 'MARCXML' ) {
+        ( $errors, $marcrecords ) = C4::ImportBatch::RecordsFromMARCXMLFile( $file, $encoding);
+    } elsif( $format eq 'ISO2709' ) {
+        ( $errors, $marcrecords ) = C4::ImportBatch::RecordsFromISO2709File( $file, $record_type, $encoding );
+    } else { # plugin based
+        $errors = [];
+        $marcrecords = C4::ImportBatch::RecordsFromMarcPlugin( $file, $format, $encoding );
+    }
+    warn "$filename: " . ( join ',', @$errors ) if @$errors;
+        # no need to exit if we have no records (or only errors) here
+        # BatchStageMarcRecords can handle that
 
     my $job = undef;
     my $dbh;
@@ -132,7 +142,7 @@ if ($completedJobID) {
       BatchStageMarcRecords(
         $record_type,    $encoding,
         $marcrecords,    $filename,
-        $to_marc_plugin, $marc_modification_template,
+        $marc_modification_template,
         $comments,       '',
         $parse_items,    0,
         50, staging_progress_callback( $job, $dbh )
@@ -175,6 +185,7 @@ if ($completedJobID) {
     };
     if ($runinbackground) {
         $job->finish($results);
+        exit 0;
     } else {
            $template->param(staged => $num_valid,
                             matched => $num_with_matches,
@@ -202,7 +213,9 @@ if ($completedJobID) {
     if ( C4::Context->preference('UseKohaPlugins') &&
          C4::Context->config('enable_plugins') ) {
 
-        my @plugins = Koha::Plugins->new()->GetPlugins('to_marc');
+        my @plugins = Koha::Plugins->new()->GetPlugins({
+            method => 'to_marc',
+        });
         $template->param( plugins => \@plugins );
     }
 }