#
# 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
+# Foundation; either version 2 of the License, or (at your op) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
my $input = new CGI;
my $dbh = C4::Context->dbh;
+$dbh->{AutoCommit} = 0;
my $fileID=$input->param('uploadedfileid');
+my $runinbackground = $input->param('runinbackground');
+my $completedJobID = $input->param('completedJobID');
my $matcher_id = $input->param('matcher');
+my $overlay_action = $input->param('overlay_action');
+my $nomatch_action = $input->param('nomatch_action');
my $parse_items = $input->param('parse_items');
+my $item_action = $input->param('item_action');
my $comments = $input->param('comments');
my $syntax = $input->param('syntax');
my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {tools => 1},
+ flagsrequired => {tools => 'stage_marc_import'},
debug => 1,
});
$template->param(SCRIPT_NAME => $ENV{'SCRIPT_NAME'},
uploadmarc => $fileID);
-if ($fileID) {
- my %cookies = parse CGI::Cookie($cookie);
- my $uploaded_file = C4::UploadedFile->fetch($cookies{'CGISESSID'}->value, $fileID);
+my %cookies = parse CGI::Cookie($cookie);
+my $sessionID = $cookies{'CGISESSID'}->value;
+if ($completedJobID) {
+ my $job = C4::BackgroundJob->fetch($sessionID, $completedJobID);
+ 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 $job_size = scalar($marcrecord =~ /\035/g);
- # if we're matching, job size is doubled
- $job_size *= 2 if ($matcher_id ne "");
+ my $filename = $uploaded_file->name();
+ my $job = undef;
+ my $staging_callback = sub { };
+ my $matching_callback = sub { };
+ if ($runinbackground) {
+ my $job_size = () = $marcrecord =~ /\035/g;
+ # 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);
+ my $jobID = $job->id();
+
+ # fork off
+ if (my $pid = fork) {
+ # parent
+ # return job ID as JSON
+
+ # prevent parent exiting from
+ # destroying the kid's database handle
+ # FIXME: according to DBI doc, this may not work for Oracle
+ $dbh->{InactiveDestroy} = 1;
+
+ my $reply = CGI->new("");
+ print $reply->header(-type => 'text/html');
+ print "{ jobID: '$jobID' }";
+ exit 0;
+ } elsif (defined $pid) {
+ # child
+ # close STDOUT to signal to Apache that
+ # we're now running in the background
+ close STDOUT;
+ close STDERR;
+ } else {
+ # fork failed, so exit immediately
+ warn "fork failed while attempting to run $ENV{'SCRIPT_NAME'} as a background job";
+ exit 0;
+ }
+
+ # if we get here, we're a child that has detached
+ # itself from Apache
+ $staging_callback = staging_progress_callback($job, $dbh);
+ $matching_callback = matching_progress_callback($job, $dbh);
+
+ }
# FIXME branch code
- my $filename = $uploaded_file->name();
- my $job = C4::BackgroundJob->new($cookies{'CGISESSID'}->value, $filename, $ENV{'SCRIPT_NAME'}, $job_size);
my ($batch_id, $num_valid, $num_items, @import_errors) = BatchStageMarcRecords($syntax, $marcrecord, $filename,
$comments, '', $parse_items, 0,
- 100, staging_progress_callback($job));
+ 50, staging_progress_callback($job, $dbh));
+ $dbh->commit();
my $num_with_matches = 0;
my $checked_matches = 0;
my $matcher_failed = 0;
if (defined $matcher) {
$checked_matches = 1;
$matcher_code = $matcher->code();
- $num_with_matches = BatchFindBibDuplicates($batch_id, $matcher, 10, 100, matching_progress_callback($job));
+ $num_with_matches = BatchFindBibDuplicates($batch_id, $matcher,
+ 10, 50, matching_progress_callback($job, $dbh));
SetImportBatchMatcher($batch_id, $matcher_id);
+ SetImportBatchOverlayAction($batch_id, $overlay_action);
+ SetImportBatchNoMatchAction($batch_id, $nomatch_action);
+ SetImportBatchItemAction($batch_id, $item_action);
+ $dbh->commit();
} else {
$matcher_failed = 1;
}
matcher_code => $matcher_code,
import_batch_id => $batch_id
};
- $job->finish($results);
-
- $template->param(staged => $num_valid,
- matched => $num_with_matches,
- num_items => $num_items,
- import_errors => scalar(@import_errors),
- total => $num_valid + scalar(@import_errors),
- checked_matches => $checked_matches,
- matcher_failed => $matcher_failed,
- matcher_code => $matcher_code,
- import_batch_id => $batch_id
- );
+ if ($runinbackground) {
+ $job->finish($results);
+ } else {
+ $template->param(staged => $num_valid,
+ matched => $num_with_matches,
+ num_items => $num_items,
+ import_errors => scalar(@import_errors),
+ total => $num_valid + scalar(@import_errors),
+ checked_matches => $checked_matches,
+ matcher_failed => $matcher_failed,
+ matcher_code => $matcher_code,
+ import_batch_id => $batch_id
+ );
+ }
} else {
# initial form
+ if (C4::Context->preference("marcflavour") eq "UNIMARC") {
+ $template->param("UNIMARC" => 1);
+ }
my @matchers = C4::Matcher::GetMatcherList();
$template->param(available_matchers => \@matchers);
}
sub staging_progress_callback {
my $job = shift;
+ my $dbh = shift;
return sub {
my $progress = shift;
- $job->progress($job->progress() + $progress);
+ $job->progress($progress);
+ $dbh->commit();
}
}
sub matching_progress_callback {
my $job = shift;
+ my $dbh = shift;
+ my $start_progress = $job->progress();
return sub {
my $progress = shift;
- $job->progress($job->progress() + $progress);
+ $job->progress($start_progress + $progress);
+ $dbh->commit();
}
}
projects / koha.git / blobdiff