X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fmanage-marc-import.pl;h=8a8d9e893b07a2bb384a4da1487619032b40c81e;hb=12ff7355bb21a30d472e987f05f1da35f00a53a5;hp=34d2639c1a810c59c746efb0de7f71e1e2f84578;hpb=b9d743a9281bfd6c853ffaa639577e1801f3b71b;p=koha_fer diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl index 34d2639c1a..8a8d9e893b 100755 --- a/tools/manage-marc-import.pl +++ b/tools/manage-marc-import.pl @@ -42,7 +42,7 @@ 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 @@ -60,7 +60,7 @@ my ($template, $loggedinuser, $cookie) my %cookies = parse CGI::Cookie($cookie); my $sessionID = $cookies{'CGISESSID'}->value; -my $dbh = C4::Context->dbh; +our $dbh = C4::Context->dbh; # Frameworks selection loop { @@ -218,7 +218,7 @@ sub import_batches_list { 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, }; @@ -433,11 +433,11 @@ sub batch_info { $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++) {