use C4::ImportBatch;
use C4::Matcher;
use C4::BackgroundJob;
+use C4::Labels qw(add_batch);
my $script_name = "/cgi-bin/koha/tools/manage-marc-import.pl";
# record list displays
my $offset = $input->param('offset') || 0;
-my $results_per_page = $input->param('results_per_page') || 10;
+my $results_per_page = $input->param('results_per_page') || 25;
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "tools/manage-marc-import.tmpl",
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {parameters => 1},
+ flagsrequired => {tools => 'manage_staged_marc'},
debug => 1,
});
my $sessionID = $cookies{'CGISESSID'}->value;
my $dbh = C4::Context->dbh;
+if ($op eq "create_labels") {
+ #create a batch of labels, then lose $op & $import_batch_id so we get back to import batch list.
+ my $label_batch_id = create_labelbatch_from_importbatch($import_batch_id);
+ $template->param( label_batch => $label_batch_id );
+ $op='';
+ $import_batch_id='';
+}
if ($op) {
$template->param(script_name => $script_name, $op => 1);
} else {
} elsif ($op eq "redo-matching") {
my $new_matcher_id = $input->param('new_matcher_id');
my $current_matcher_id = $input->param('current_matcher_id');
- redo_matching($template, $import_batch_id, $new_matcher_id, $current_matcher_id);
+ my $overlay_action = $input->param('overlay_action');
+ my $nomatch_action = $input->param('nomatch_action');
+ my $item_action = $input->param('item_action');
+ redo_matching($template, $import_batch_id, $new_matcher_id, $current_matcher_id,
+ $overlay_action, $nomatch_action, $item_action);
import_biblios_list($template, $import_batch_id, $offset, $results_per_page);
-}
+}
output_html_with_http_headers $input, $cookie, $template->output;
exit 0;
sub redo_matching {
- my ($template, $import_batch_id, $new_matcher_id, $current_matcher_id) = @_;
+ my ($template, $import_batch_id, $new_matcher_id, $current_matcher_id, $overlay_action, $nomatch_action, $item_action) = @_;
my $rematch_failed = 0;
return if not defined $new_matcher_id and not defined $current_matcher_id;
- return if $new_matcher_id == $current_matcher_id;
+ my $old_overlay_action = GetImportBatchOverlayAction($import_batch_id);
+ my $old_nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
+ my $old_item_action = GetImportBatchItemAction($import_batch_id);
+ return if $new_matcher_id == $current_matcher_id and
+ $old_overlay_action eq $overlay_action and
+ $old_nomatch_action eq $nomatch_action and
+ $old_item_action eq $item_action;
+
+ if ($old_overlay_action ne $overlay_action) {
+ SetImportBatchOverlayAction($import_batch_id, $overlay_action);
+ $template->param('changed_overlay_action' => 1);
+ }
+ if ($old_nomatch_action ne $nomatch_action) {
+ SetImportBatchNoMatchAction($import_batch_id, $nomatch_action);
+ $template->param('changed_nomatch_action' => 1);
+ }
+ if ($old_item_action ne $item_action) {
+ SetImportBatchItemAction($import_batch_id, $item_action);
+ $template->param('changed_item_action' => 1);
+ }
+
+ if ($new_matcher_id == $current_matcher_id) {
+ return;
+ }
+
my $num_with_matches = 0;
if (defined $new_matcher_id and $new_matcher_id ne "") {
my $matcher = C4::Matcher->fetch($new_matcher_id);
}
} else {
$num_with_matches = BatchFindBibDuplicates($import_batch_id, undef);
- SetImportBatchMatcher($import_batch_id, undef);
+ SetImportBatchMatcher($import_batch_id, undef);
+ SetImportBatchOverlayAction('create_new');
}
$template->param(rematch_failed => $rematch_failed);
$template->param(rematch_attempted => 1);
$template->param(num_with_matches => $num_with_matches);
}
+sub create_labelbatch_from_importbatch {
+ my ($batch_id) = @_;
+ my @items = GetItemNumbersFromImportBatch($batch_id);
+ my $labelbatch = add_batch('labels',\@items);
+ return $labelbatch;
+}
+
sub import_batches_list {
my ($template, $offset, $results_per_page) = @_;
my $batches = GetImportBatchRangeDesc($offset, $results_per_page);
my ($template, $import_batch_id) = @_;
my $job = undef;
+ $dbh->{AutoCommit} = 0;
my $callback = sub {};
if ($runinbackground) {
$job = put_in_background($import_batch_id);
- $callback = progress_callback($job);
+ $callback = progress_callback($job, $dbh);
}
- my ($num_added, $num_updated, $num_items_added, $num_ignored) = BatchCommitBibRecords($import_batch_id, 50, $callback);
+ my ($num_added, $num_updated, $num_items_added, $num_items_errored, $num_ignored) =
+ BatchCommitBibRecords($import_batch_id, 50, $callback);
+ $dbh->commit();
my $results = {
did_commit => 1,
num_added => $num_added,
num_updated => $num_updated,
num_items_added => $num_items_added,
+ num_items_errored => $num_items_errored,
num_ignored => $num_ignored
};
if ($runinbackground) {
sub revert_batch {
my ($template, $import_batch_id) = @_;
+ $dbh->{AutoCommit} = 0;
my $job = undef;
my $callback = sub {};
if ($runinbackground) {
$job = put_in_background($import_batch_id);
- $callback = progress_callback($job);
+ $callback = progress_callback($job, $dbh);
}
my ($num_deleted, $num_errors, $num_reverted, $num_items_deleted, $num_ignored) =
BatchRevertBibRecords($import_batch_id, 50, $callback);
+ $dbh->commit();
my $results = {
did_revert => 1,
sub progress_callback {
my $job = shift;
+ my $dbh = shift;
return sub {
my $progress = shift;
$job->progress($progress);
+ $dbh->commit();
}
}
$template->param(num_results => $num_biblios);
$template->param(results_per_page => $results_per_page);
$template->param(import_batch_id => $import_batch_id);
+ my $overlay_action = GetImportBatchOverlayAction($import_batch_id);
+ $template->param("overlay_action_${overlay_action}" => 1);
+ $template->param(overlay_action => $overlay_action);
+ my $nomatch_action = GetImportBatchNoMatchAction($import_batch_id);
+ $template->param("nomatch_action_${nomatch_action}" => 1);
+ $template->param(nomatch_action => $nomatch_action);
+ my $item_action = GetImportBatchItemAction($import_batch_id);
+ $template->param("item_action_${item_action}" => 1);
+ $template->param(item_action => $item_action);
batch_info($template, $batch);
}
$template->param(upload_timestamp => $batch->{'upload_timestamp'});
$template->param(num_biblios => $batch->{'num_biblios'});
$template->param(num_items => $batch->{'num_biblios'});
- if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
- $template->param(can_commit => 1);
- }
- if ($batch->{'import_status'} eq 'imported') {
- $template->param(can_revert => 1);
+ if ($batch->{'num_biblios'} > 0) {
+ if ($batch->{'import_status'} eq 'staged' or $batch->{'import_status'} eq 'reverted') {
+ $template->param(can_commit => 1);
+ }
+ if ($batch->{'import_status'} eq 'imported') {
+ $template->param(can_revert => 1);
+ }
}
if (defined $batch->{'matcher_id'}) {
my $matcher = C4::Matcher->fetch($batch->{'matcher_id'});
projects / koha_gimpoz / blobdiff