Changeset 24927 for gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/HtmlToExpediteeAction.pm

Timestamp:

2012-01-09T16:16:59+13:00 (12 years ago)

Author:

davidb

Message:

More careful handling of JSON strings to work correctly with UTF8

File:

• gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/HtmlToExpediteeAction.pm (modified) (3 diffs)

gs3-extensions/html-to-expeditee/trunk/src/perllib/cgiactions/HtmlToExpediteeAction.pm

@@ -48 +48 @@
 my $action_table =
 { 
-    "generate-frame"     => { 'compulsory-args' => [ "json" ],
+    "generate-frame"     => { 'compulsory-args' => [ "fn", "json" ],
                   'optional-args'   => [] }, 
 };
@@ -80 +80 @@
     # no need to lock collection (??), the operation is read only
 
-    my $json_str = $gsdl_cgi->param("json");
-    # my $exp_frame_tree = decode_json($json_str);
+    my $json_str_unicode = $self->{'json'}; 
+    my $json_str_utf8 = Encode::encode("utf8",$json_str_unicode);
+    my $exp_frame_tree = decode_json $json_str_utf8;
     
+
     my $output_dir = &util::filename_cat($collect_dir,$collect,"export");
 
@@ -91 +93 @@
 
     if (open(FOUT,">$frame_filename")) {
-    
-    print FOUT $json_str;
+    binmode(FOUT,":utf8");
+
+    print FOUT $json_str_utf8;
     close(FOUT);