use C4::ImportBatch;
use C4::Matcher;
use C4::BackgroundJob;
-use C4::Labels::Batch 1.000000;
+use C4::Labels::Batch;
use C4::Branch qw(get_branch_code_from_name);
my $script_name = "/cgi-bin/koha/tools/manage-marc-import.pl";
my $input = new CGI;
my $op = $input->param('op') || '';
my $completedJobID = $input->param('completedJobID');
-my $runinbackground = $input->param('runinbackground');
+our $runinbackground = $input->param('runinbackground');
my $import_batch_id = $input->param('import_batch_id') || '';
# record list displays
my %cookies = parse CGI::Cookie($cookie);
my $sessionID = $cookies{'CGISESSID'}->value;
-my $dbh = C4::Context->dbh;
+our $dbh = C4::Context->dbh;
# Frameworks selection loop
{
sub create_labelbatch_from_importbatch {
my ($batch_id) = @_;
my $err = undef;
- my $branch_code = get_branch_code_from_name($template->param('LoginBranchname'));
+ my $branch_code = C4::Context->userenv->{'branch'};
my $batch = C4::Labels::Batch->new(branch_code => $branch_code);
my @items = GetItemNumbersFromImportBatch($batch_id);
if (grep{$_ == 0} @items) {
num_items => $batch->{'num_items'},
upload_timestamp => $batch->{'upload_timestamp'},
import_status => $batch->{'import_status'},
- file_name => $batch->{'file_name'},
+ file_name => $batch->{'file_name'} || "($batch->{'batch_type'})",
comments => $batch->{'comments'},
can_clean => ($batch->{'import_status'} ne 'cleaned') ? 1 : 0,
};
$template->param('current_matcher_description' => $matcher->description());
}
}
- add_matcher_list($batch->{'matcher_id'});
+ add_matcher_list($template,$batch->{'matcher_id'});
}
sub add_matcher_list {
- my $current_matcher_id = shift;
+ my ($template,$current_matcher_id) = @_;
my @matchers = C4::Matcher::GetMatcherList();
if (defined $current_matcher_id) {
for (my $i = 0; $i <= $#matchers; $i++) {