[Koha-patches] [PATCH] [SIGNED OFF] Bug 5449: JSON malformed in Koha - Blocker with jQuery 1.4.x
Julian Maurice
julian.maurice at biblibre.com
Fri Mar 11 14:36:53 CET 2011
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
---
offline_circ/process_koc.pl | 2 +-
test/progressbarsubmit.pl | 2 +-
tools/background-job-progress.pl | 4 ++--
tools/batchMod.pl | 2 +-
tools/manage-marc-import.pl | 2 +-
tools/stage-marc-import.pl | 2 +-
tools/upload-file-progress.pl | 4 ++--
tools/upload-file.pl | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
index 5f0d9ff..bf7bc48 100755
--- a/offline_circ/process_koc.pl
+++ b/offline_circ/process_koc.pl
@@ -92,7 +92,7 @@ if ($completedJobID) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
- print "{ jobID: '$jobID' }";
+ print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# child
diff --git a/test/progressbarsubmit.pl b/test/progressbarsubmit.pl
index 22b0a41..0982f58 100755
--- a/test/progressbarsubmit.pl
+++ b/test/progressbarsubmit.pl
@@ -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
diff --git a/tools/background-job-progress.pl b/tools/background-job-progress.pl
index db4d890..380ad15 100755
--- a/tools/background-job-progress.pl
+++ b/tools/background-job-progress.pl
@@ -36,7 +36,7 @@ my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value,
if ($auth_status ne "ok") {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
- print "{ progress: 0 }";
+ print '{"progress":"0"}';
exit 0;
}
@@ -54,4 +54,4 @@ if (defined $job) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
# response will be sent back as JSON
-print "{ progress: $reported_progress, job_size: $job_size, job_status: '$job_status' }";
+print '{"progress":"' . $reported_progress . '","job_size":"' . $job_size . '","job_status":"' . $job_status . '"}';
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index c400ae9..7906d28 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -556,7 +556,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
diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index e7ff78e..f40596e 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -298,7 +298,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
diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index b113332..54ebfb9 100755
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -108,7 +108,7 @@ if ($completedJobID) {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
- print "{ jobID: '$jobID' }";
+ print '{"jobID":"' . $jobID . '"}';
exit 0;
} elsif (defined $pid) {
# child
diff --git a/tools/upload-file-progress.pl b/tools/upload-file-progress.pl
index e3a643b..c457dbb 100755
--- a/tools/upload-file-progress.pl
+++ b/tools/upload-file-progress.pl
@@ -35,7 +35,7 @@ my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value,
if ($auth_status ne "ok") {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
- print "{ progress: 0 }";
+ print '{"progress":"0"}';
exit 0;
}
@@ -44,4 +44,4 @@ my $reported_progress = C4::UploadedFile->upload_progress($sessionID);
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
# response will be sent back as JSON
-print "{ progress: $reported_progress }";
+print '{"progress":"' . $reported_progress . '"}';
diff --git a/tools/upload-file.pl b/tools/upload-file.pl
index 1f38d07..d520b4d 100755
--- a/tools/upload-file.pl
+++ b/tools/upload-file.pl
@@ -80,5 +80,5 @@ sub send_reply {
my $reply = CGI->new("");
print $reply->header(-type => 'text/html');
# response will be sent back as JSON
- print "{ status: '$upload_status', fileid: '$fileid' }";
+ print '{"status":"' . $upload_status . '","fileid":"' . $fileid . '"}';
}
--
1.7.1
More information about the Koha-patches
mailing list