# 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 );
use C4::Biblio;
use C4::ImportBatch;
use C4::Matcher;
-use Koha::Upload;
+use Koha::UploadedFiles;
use C4::BackgroundJob;
use C4::MarcModificationTemplates;
use Koha::Plugins;
my $item_action = $input->param('item_action');
my $comments = $input->param('comments');
my $record_type = $input->param('record_type');
-my $encoding = $input->param('encoding');
-my $to_marc_plugin = $input->param('to_marc_plugin');
+my $encoding = $input->param('encoding') || 'UTF-8';
+my $format = $input->param('format') || 'ISO2709';
my $marc_modification_template = $input->param('marc_modification_template_id');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
);
$template->param(
- SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
+ SCRIPT_NAME => '/cgi-bin/koha/tools/stage-marc-import.pl',
uploadmarc => $fileID,
record_type => $record_type,
);
my $results = $job->results();
$template->param(map { $_ => $results->{$_} } keys %{ $results });
} elsif ($fileID) {
- my $upload = Koha::Upload->new->get({ id => $fileID, filehandle => 1 });
- my $fh = $upload->{fh};
- my $filename = $upload->{name}; # filename only, no path
- my $marcrecord='';
- $/ = "\035";
- while (<$fh>) {
- s/^\s+//;
- s/\s+$//;
- $marcrecord.=$_;
- }
- $fh->close;
+ 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;
if ($runinbackground) {
- my $job_size = () = $marcrecord =~ /\035/g;
+ my $job_size = scalar(@$marcrecords);
# if we're matching, job size is doubled
$job_size *= 2 if ($matcher_id ne "");
- $job = C4::BackgroundJob->new($sessionID, $filename, $ENV{'SCRIPT_NAME'}, $job_size);
+ $job = C4::BackgroundJob->new($sessionID, $filename, '/cgi-bin/koha/tools/stage-marc-import.pl', $job_size);
my $jobID = $job->id();
# fork off
# close STDERR; # there is no good reason to close STDERR
} else {
# fork failed, so exit immediately
- warn "fork failed while attempting to run $ENV{'SCRIPT_NAME'} as a background job: $!";
+ warn "fork failed while attempting to run tools/stage-marc-import.pl as a background job: $!";
exit 0;
}
my ( $batch_id, $num_valid, $num_items, @import_errors ) =
BatchStageMarcRecords(
$record_type, $encoding,
- $marcrecord, $filename,
- $to_marc_plugin, $marc_modification_template,
+ $marcrecords, $filename,
+ $marc_modification_template,
$comments, '',
$parse_items, 0,
50, staging_progress_callback( $job, $dbh )
};
if ($runinbackground) {
$job->finish($results);
+ exit 0;
} else {
$template->param(staged => $num_valid,
matched => $num_with_matches,
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 );
}
}