From: miker <miker@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Fri, 18 Feb 2005 18:27:17 +0000 (+0000)
Subject: fixing to allow empty strings, and must be called as a class method
X-Git-Tag: osrf_rel_2_0_1~1781
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=a9f830896ad3c8e813e654375d2271c559329c9b;p=OpenSRF.git

fixing to allow empty strings, and must be called as a class method


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

diff --git a/src/perlmods/JSON.pm b/src/perlmods/JSON.pm
index dac7bca..cbdbc3e 100644
--- a/src/perlmods/JSON.pm
+++ b/src/perlmods/JSON.pm
@@ -38,7 +38,10 @@ sub register_class_hint {
 
 sub JSON2perl {
 	my ($class, $json) = @_;
-	$json ||= $class;
+
+	if (!defined($json)) {
+		return undef;
+	}
 
 	#$json =~ s/\/\/.+$//gmo; # remove C++ comments
 	$json =~ s/(?<!\\)\$/\\\$/gmo; # fixup $ for later
@@ -52,7 +55,7 @@ sub JSON2perl {
 				   {				| # start object
 				   \[				| # start array
 				   -?\d+\.?\d*			| # number literal
-				   "(?:(?:\\[\"])|[^\"])+"	| # string literal
+				   "(?:(?:\\[\"])|[^\"])*"	| # string literal
 				   (?:\/\*.+?\*\/)		| # C comment
 				   true				| # bool true
 				   false			| # bool false
@@ -109,7 +112,6 @@ sub JSON2perl {
 
 sub perl2JSON {
 	my ($class, $perl) = @_;
-	$perl ||= $class;
 
 	my $output = '';
 	if (!defined($perl)) {
@@ -120,10 +122,10 @@ sub perl2JSON {
 		$output .= '/*--S '.$_class_map{ref($perl)}{hint}.'--*/';
 		if (lc($_class_map{ref($perl)}{type}) eq 'hash') {
 			my %hash =  %$perl;
-			$output .= perl2JSON(\%hash);
+			$output .= perl2JSON(undef,\%hash);
 		} elsif (lc($_class_map{ref($perl)}{type}) eq 'array') {
 			my @array =  @$perl;
-			$output .= perl2JSON(\@array);
+			$output .= perl2JSON(undef,\@array);
 		}
 		$output .= '/*--E '.$_class_map{ref($perl)}{hint}.'--*/';
 	} elsif (ref($perl) and ref($perl) =~ /HASH/) {
@@ -132,7 +134,7 @@ sub perl2JSON {
 		for my $key (sort keys %$perl) {
 			$output .= ',' if ($c); 
 			
-			$output .= perl2JSON($key).':'.perl2JSON($$perl{$key});
+			$output .= perl2JSON(undef,$key).':'.perl2JSON(undef,$$perl{$key});
 			$c++;
 		}
 		$output .= '}';
@@ -142,7 +144,7 @@ sub perl2JSON {
 		for my $part (@$perl) {
 			$output .= ',' if ($c); 
 			
-			$output .= perl2JSON($part);
+			$output .= perl2JSON(undef,$part);
 			$c++;
 		}
 		$output .= ']';