From c37b2f31d512fe200da7410199d311171306b8b0 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 22 Aug 2017 16:41:46 +0200 Subject: [PATCH] Bug 19163: Critical typo in stage-marc-import process Template says ISO2709 but script wants MARC or MARCXML.. Slipped in with bug 19049. Trivial but critical fix. Test plan: Import a MARC file. Signed-off-by: Tomas Cohen Arazi I picked this fix because I think MARC is always ambiguous. ISO2709 clearly denotes the serialization format used. Signed-off-by: Liz Rea Signed-off-by: Jonathan Druart (cherry picked from commit af791d83e435587494fa04a45375f48a3e2ad236) Signed-off-by: Fridolin Somers --- tools/stage-marc-import.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl index c845060212..07a921fdc4 100755 --- a/tools/stage-marc-import.pl +++ b/tools/stage-marc-import.pl @@ -57,7 +57,7 @@ my $item_action = $input->param('item_action'); my $comments = $input->param('comments'); my $record_type = $input->param('record_type'); my $encoding = $input->param('encoding') || 'UTF-8'; -my $format = $input->param('format') || 'MARC'; +my $format = $input->param('format') || 'ISO2709'; my $marc_modification_template = $input->param('marc_modification_template_id'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( @@ -91,7 +91,7 @@ if ($completedJobID) { my ( $errors, $marcrecords ); if( $format eq 'MARCXML' ) { ( $errors, $marcrecords ) = C4::ImportBatch::RecordsFromMARCXMLFile( $file, $encoding); - } elsif( $format eq 'MARC' ) { + } elsif( $format eq 'ISO2709' ) { ( $errors, $marcrecords ) = C4::ImportBatch::RecordsFromISO2709File( $file, $record_type, $encoding ); } else { # plugin based $errors = []; -- 2.39.5