# 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 );
# Koha modules used
use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::Biblio;
-use C4::ImportBatch;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use C4::ImportBatch qw( RecordsFromMARCXMLFile RecordsFromISO2709File RecordsFromMarcPlugin BatchStageMarcRecords BatchFindDuplicates SetImportBatchMatcher SetImportBatchOverlayAction SetImportBatchNoMatchAction SetImportBatchItemAction );
use C4::Matcher;
-use C4::UploadedFile;
+use Koha::UploadedFiles;
use C4::BackgroundJob;
-use C4::MarcModificationTemplates;
+use C4::MarcModificationTemplates qw( GetModificationTemplates );
use Koha::Plugins;
+use Koha::ImportBatches;
-my $input = new CGI;
+my $input = CGI->new;
my $fileID = $input->param('uploadedfileid');
my $runinbackground = $input->param('runinbackground');
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 $basketno = $input->param('basketno');
+my $booksellerid = $input->param('booksellerid');
+my $profile_id = $input->param('profile_id');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "tools/stage-marc-import.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => { tools => 'stage_marc_import' },
- debug => 1,
}
);
$template->param(
- SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
- uploadmarc => $fileID
+ SCRIPT_NAME => '/cgi-bin/koha/tools/stage-marc-import.pl',
+ uploadmarc => $fileID,
+ record_type => $record_type,
+ basketno => $basketno,
+ booksellerid => $booksellerid,
);
my %cookies = parse CGI::Cookie($cookie);
my $results = $job->results();
$template->param(map { $_ => $results->{$_} } keys %{ $results });
} elsif ($fileID) {
- my $uploaded_file = C4::UploadedFile->fetch($sessionID, $fileID);
- my $fh = $uploaded_file->fh();
- my $marcrecord='';
- $/ = "\035";
- while (<$fh>) {
- s/^\s+//;
- s/\s+$//;
- $marcrecord.=$_;
- }
-
- my $filename = $uploaded_file->name();
+ 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
exit 0;
} elsif (defined $pid) {
# child
- # close STDOUT to signal to Apache that
- # we're now running in the background
+ # close STDOUT/STDERR to signal to end CGI session with Apache
+ # Otherwise, the AJAX request to this script won't return properly
close STDOUT;
- # close STDERR; # there is no good reason to close STDERR
+ 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;
}
}
- # New handle, as we're a child.
- $dbh = C4::Context->dbh({new => 1});
- $dbh->{AutoCommit} = 0;
+ my $schema = Koha::Database->new->schema;
+ $schema->storage->txn_begin;
+
# FIXME branch code
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 )
+ 50, staging_progress_callback( $job )
);
+ if($profile_id) {
+ my $ibatch = Koha::ImportBatches->find($batch_id);
+ $ibatch->set({profile_id => $profile_id})->store;
+ }
+
my $num_with_matches = 0;
my $checked_matches = 0;
my $matcher_failed = 0;
$matcher_code = $matcher->code();
$num_with_matches =
BatchFindDuplicates( $batch_id, $matcher, 10, 50,
- matching_progress_callback( $job, $dbh ) );
+ matching_progress_callback($job) );
SetImportBatchMatcher($batch_id, $matcher_id);
SetImportBatchOverlayAction($batch_id, $overlay_action);
SetImportBatchNoMatchAction($batch_id, $nomatch_action);
SetImportBatchItemAction($batch_id, $item_action);
- $dbh->commit();
+ $schema->storage->txn_commit;
} else {
$matcher_failed = 1;
+ $schema->storage->txn_rollback;
}
} else {
- $dbh->commit();
+ $schema->storage->txn_commit;
}
my $results = {
checked_matches => $checked_matches,
matcher_failed => $matcher_failed,
matcher_code => $matcher_code,
- import_batch_id => $batch_id
+ import_batch_id => $batch_id,
+ booksellerid => $booksellerid,
+ basketno => $basketno
};
if ($runinbackground) {
$job->finish($results);
+ exit 0;
} else {
$template->param(staged => $num_valid,
matched => $num_with_matches,
checked_matches => $checked_matches,
matcher_failed => $matcher_failed,
matcher_code => $matcher_code,
- import_batch_id => $batch_id
+ import_batch_id => $batch_id,
+ booksellerid => $booksellerid,
+ basketno => $basketno
);
}
my @templates = GetModificationTemplates();
$template->param( MarcModificationTemplatesLoop => \@templates );
- if ( C4::Context->preference('UseKohaPlugins') &&
- C4::Context->config('enable_plugins') ) {
+ if ( 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 );
}
}
sub staging_progress_callback {
my $job = shift;
- my $dbh = shift;
return sub {
my $progress = shift;
$job->progress($progress);
sub matching_progress_callback {
my $job = shift;
- my $dbh = shift;
my $start_progress = $job->progress();
return sub {
my $progress = shift;
projects / srvgit / blobdiff