From: miker <miker@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Mon, 7 Nov 2005 17:59:48 +0000 (+0000)
Subject: stripping bad characters
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1a58e76158eb1d72d5ee90ee4b2fd08bf87b2654;p=opensrf%2Fbjwebb.git

stripping bad characters


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

diff --git a/src/perlmods/JSON.pm b/src/perlmods/JSON.pm
index d264496..3b35685 100644
--- a/src/perlmods/JSON.pm
+++ b/src/perlmods/JSON.pm
@@ -205,7 +205,8 @@ sub perl2JSON {
 			$outkey =~ s/\f/\\f/sgo;
 			$outkey =~ s/\r/\\r/sgo;
 			$outkey =~ s/\n/\\n/sgo;
-			$outkey =~ s/(\pM)/sprintf('\u%0.4x',ord($1))/sgoe;
+			$outkey =~ s/(\pM|\pS)/sprintf('\u%0.4x',ord($1))/sgoe;
+			$outkey =~ s/[\x80-\xff]//sgoe;
 
 			$output .= '"'.$outkey.'":'. perl2JSON(undef,$$perl{$key}, $strict);
 			$c++;
@@ -234,7 +235,8 @@ sub perl2JSON {
 		$perl =~ s/\f/\\f/sgo;
 		$perl =~ s/\r/\\r/sgo;
 		$perl =~ s/\n/\\n/sgo;
-		$perl =~ s/(\pM|\pC)/sprintf('\u%0.4x',ord($1))/sgoe;
+		$perl =~ s/(\pM|\pC|\pM)/sprintf('\u%0.4x',ord($1))/sgoe;
+		$perl =~ s/[\x80-\xff]//sgoe;
 		if (length($perl) < 10 and $perl =~ /^(?:\+|-)?\d*\.?\d+$/o and $perl !~ /^(?:\+|-)?0\d+/o ) {
 			$output = $perl;
 		} else {
@@ -315,6 +317,7 @@ sub perl2prettyJSON {
 		$perl =~ s/\r/\\r/sgo;
 		$perl =~ s/\n/\\n/sgo;
 		$perl =~ s/(\pM|\pC)/sprintf('\u%0.4x',ord($1))/sgoe;
+		$perl =~ s/[\x80-\xff]//sgoe;
 		$output .= "   "x$depth unless($nospace);
 		if (length($perl) < 10 and $perl =~ /^(?:\+|-)?\d*\.?\d+$/o and $perl !~ /^(?:\+|-)?0\d+/o ) {
 			$output = $perl;