X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fmanage-marc-import.pl;h=8a8d9e893b07a2bb384a4da1487619032b40c81e;hb=12ff7355bb21a30d472e987f05f1da35f00a53a5;hp=61c0965ddb91f9c1b6c9bff9268421b05ff87435;hpb=7a71d2c5e8f5a6685b0382217f83c98f850ef269;p=koha_fer

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index 61c0965ddb..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
 {
@@ -189,7 +189,7 @@ sub redo_matching {
 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) {
@@ -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,
         };
@@ -310,7 +310,7 @@ sub put_in_background {
 
         my $reply = CGI->new("");
         print $reply->header(-type => 'text/html');
-        print "{ jobID: '$jobID' }";
+        print '{"jobID":"' . $jobID . '"}';
         exit 0;
     } elsif (defined $pid) {
         # child
@@ -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++) {