Bug 14321: Integrate Upload.pm into Koha

[srvgit] / test / progressbarsubmit.pl

diff --git a/test/progressbarsubmit.pl b/test/progressbarsubmit.pl
index a0dbde1..0a4a497 100755 (executable)
--- a/test/progressbarsubmit.pl
+++ b/test/progressbarsubmit.pl
@@ -3,32 +3,32 @@
 # Script for testing progressbar, part 2 - json submit handler
 #   and Z39.50 lookups
 
-# Koha library project  www.koha.org
+# Koha library project  www.koha-community.org
 
 # Licensed under the GPL
 
-# Copyright 2000-2002 Katipo Communications
+# Copyright 2010  Catalyst IT, Ltd
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 
 # standard or CPAN modules used
-use CGI;
+use CGI qw ( -utf8 );
 use CGI::Cookie;
 
 # Koha modules used
@@ -45,7 +45,7 @@ my $jobID = $input->param('jobID');
 my $completedJobID = $input->param('completedJobID');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "test/progressbar.tmpl",
+    = get_template_and_user({template_name => "test/progressbar.tt",
                     query => $input,
                     type => "intranet",
                     debug => 1,
@@ -72,7 +72,7 @@ if ($completedJobID) {
 
             my $reply = CGI->new("");
             print $reply->header(-type => 'text/html');
-            print "{ jobID: '$jobID' }";
+            print '{"jobID":"' . $jobID . '"}';
             exit 0;
         } elsif (defined $pid) {
         # if we get here, we're a child that has detached
@@ -84,8 +84,8 @@ if ($completedJobID) {
             close STDERR;
 
             foreach (1..100) {
-                sleep 1;
                 $job->progress( $_ );
+                sleep 1;
             }
             $job->finish();
         } else {