From: miker <miker@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Thu, 4 Aug 2005 18:36:19 +0000 (+0000)
Subject: ooops... octal ;)
X-Git-Tag: osrf_rel_2_0_1~1410
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=30ca3b41dd5f118f3ebb23faa8ad490c8813cb02;p=OpenSRF.git

ooops... octal ;)


git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@463 9efc2488-bf62-4759-914b-345cdb29e865
---

diff --git a/src/perlmods/JSON.pm b/src/perlmods/JSON.pm
index 1f1177c..13db444 100644
--- a/src/perlmods/JSON.pm
+++ b/src/perlmods/JSON.pm
@@ -223,7 +223,7 @@ sub perl2JSON {
 		$perl =~ s/\r/\\r/sgo;
 		$perl =~ s/\n/\\n/sgo;
 		$perl =~ s/(\pM)/sprintf('\u%0.4x',ord($1))/sgoe;
-		if (length($perl) < 10 and $perl =~ /^(?:\+|-)?\d*\.?\d+$/) {
+		if (length($perl) < 10 and $perl =~ /^(?:\+|-)?\d*\.?\d+$/o and $perl !~ /^(?:\+|-)?0\d+/o ) {
 			$output = $perl;
 		} else {
 			$output = '"'.$perl.'"';
@@ -303,6 +303,11 @@ sub perl2prettyJSON {
 		$perl =~ s/\n/\\n/sgo;
 		$perl =~ s/(\pM)/sprintf('\u%0.4x',ord($1))/sgoe;
 		$output .= "   "x$depth unless($nospace);
+		if (length($perl) < 10 and $perl =~ /^(?:\+|-)?\d*\.?\d+$/o and $perl !~ /^(?:\+|-)?0\d+/o ) {
+			$output = $perl;
+		} else {
+			$output = '"'.$perl.'"';
+		}
 		$output .= '"'.$perl.'"';
 	}