[Koha-patches] [PATCH] Bug 7790 - tools/manage-marc-import.pl breaks with plack

Dobrica Pavlinusic dpavlin at rot13.org
Fri Mar 23 11:15:11 CET 2012


transfer $template to add_matcher_list for correct scoping
and score $dbh and $runinbackground with our
---
 tools/manage-marc-import.pl |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index 34d2639..cc22aeb 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
 {
@@ -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++) {
-- 
1.7.2.5



More information about the Koha-patches mailing list