# Script for handling import of MARC data into Koha db
# and Z39.50 lookups
-# Koha library project www.koha.org
+# Koha library project www.koha-community.org
# Licensed under the GPL
#
# 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 op) any later
+# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
+#use warnings; FIXME - Bug 2505
# standard or CPAN modules used
use CGI;
# Koha modules used
use C4::Context;
use C4::Auth;
-use C4::Input;
use C4::Output;
use C4::Biblio;
use C4::ImportBatch;
use C4::Matcher;
use C4::UploadedFile;
use C4::BackgroundJob;
+use C4::MarcModificationTemplates;
my $input = new CGI;
-my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
my $fileID=$input->param('uploadedfileid');
my $runinbackground = $input->param('runinbackground');
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 $record_type = $input->param('record_type');
+my $encoding = $input->param('encoding');
+my $marc_modification_template = $input->param('marc_modification_template_id');
+
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "tools/stage-marc-import.tmpl",
query => $input,
my $filename = $uploaded_file->name();
my $job = undef;
- my $staging_callback = sub { };
- my $matching_callback = sub { };
+ my $dbh;
if ($runinbackground) {
my $job_size = () = $marcrecord =~ /\035/g;
# if we're matching, job size is doubled
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' }";
+ 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;
+ # 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 $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);
}
+ # New handle, as we're a child.
+ $dbh = C4::Context->dbh({new => 1});
+ $dbh->{AutoCommit} = 0;
# FIXME branch code
- my ($batch_id, $num_valid, $num_items, @import_errors) = BatchStageMarcRecords($syntax, $marcrecord, $filename,
- $comments, '', $parse_items, 0,
- 50, staging_progress_callback($job, $dbh));
- $dbh->commit();
+ my ( $batch_id, $num_valid, $num_items, @import_errors ) =
+ BatchStageMarcRecords(
+ $record_type, $encoding,
+ $marcrecord, $filename,
+ $marc_modification_template, $comments,
+ '', $parse_items,
+ 0, 50,
+ staging_progress_callback( $job, $dbh )
+ );
+
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, 50, matching_progress_callback($job, $dbh));
+ $num_with_matches =
+ BatchFindDuplicates( $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);
}
my $results = {
- staged => $num_valid,
- matched => $num_with_matches,
- num_items => $num_items,
- import_errors => scalar(@import_errors),
- total => $num_valid + scalar(@import_errors),
+ 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,
+ matcher_failed => $matcher_failed,
+ matcher_code => $matcher_code,
import_batch_id => $batch_id
};
if ($runinbackground) {
}
my @matchers = C4::Matcher::GetMatcherList();
$template->param(available_matchers => \@matchers);
+
+ my @templates = GetModificationTemplates();
+ $template->param( MarcModificationTemplatesLoop => \@templates );
+
}
output_html_with_http_headers $input, $cookie, $template->output;
return sub {
my $progress = shift;
$job->progress($progress);
- $dbh->commit();
}
}
return sub {
my $progress = shift;
$job->progress($start_progress + $progress);
- $dbh->commit();
}
}