Item8730: fixing utf8

git-svn-id: http://svn.foswiki.org/trunk/SoapPlugin@6790 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Mar 19, 2010 · 10ddd7d · 10ddd7d
1 parent 8925014
commit 10ddd7d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/data/System/SoapPlugin.txt b/data/System/SoapPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="micha" date="1269028908" format="1.1" version="1.6"}%
+%META:TOPICINFO{author="ProjectContributor" date="1269028908" format="1.1" version="1.6"}%
 ---+!! %TOPIC%
 %SHORTDESCRIPTION%
 
@@ -146,7 +146,7 @@ Every message created by !SoapPlugin adds a set of foswiki-specific headers whic
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  19 Mar 2010: | rewrite of serializer; implemented =$valueof()= etc |
+|  19 Mar 2010: | rewrite of serializer; implemented =$valueof()= etc; fixed UTF8 handling |
 |  16 Mar 2010: | initial release |
 |  Dependencies: | %$DEPENDENCIES% |
 |  Home page: | Foswiki:Extensions/%TOPIC% |

diff --git a/lib/Foswiki/Plugins/SoapPlugin.pm b/lib/Foswiki/Plugins/SoapPlugin.pm
@@ -16,7 +16,7 @@ use strict;
 use Foswiki::Func ();
 
 our $VERSION = '$Rev$';
-our $RELEASE = '0.4';
+our $RELEASE = '0.5';
 our $SHORTDESCRIPTION = 'SOAP for Foswiki';
 our $NO_PREFS_IN_TOPIC = 1;
 our $baseWeb;

diff --git a/lib/Foswiki/Plugins/SoapPlugin/Core.pm b/lib/Foswiki/Plugins/SoapPlugin/Core.pm
@@ -18,6 +18,8 @@ package Foswiki::Plugins::SoapPlugin::Core;
 use strict;
 use Foswiki::Plugins ();
 use Foswiki::Plugins::SoapPlugin::Client();
+use Unicode::MapUTF8 ();
+
 our $baseWeb;
 our $baseTopic;
 our %clients;
@@ -200,14 +202,14 @@ sub stringify {
     my $line = $params->{format};
     $line = '$value' unless defined $line;
 
-    $line =~ s/\$(key|name)/($dataItem->name()||'')/ge;
-    $line =~ s/\$type/($dataItem->type()||'')/ge;
-    $line =~ s/\$uri/($dataItem->uri()||'')/ge;
-    $line =~ s/\$prefix/($dataItem->prefix()||'')/ge;
-    $line =~ s/\$attr\((.*?)\)/($dataItem->attr($1)||'')/ge;
+    $line =~ s/\$(key|name)/fromUtf8($dataItem->name()||'')/ge;
+    $line =~ s/\$type/fromUtf8($dataItem->type()||'')/ge;
+    $line =~ s/\$uri/fromUtf8($dataItem->uri()||'')/ge;
+    $line =~ s/\$prefix/fromUtf8($dataItem->prefix()||'')/ge;
+    $line =~ s/\$attr\((.*?)\)/fromUtf8($dataItem->attr($1)||'')/ge;
     $line =~ s/\$index/$currentIndex/g;
     $line =~ s/\$depth/$depth/g;
-    $line =~ s/\$valueof\((.*?)\)/($som->valueof($1||'')||'')/ge;
+    $line =~ s/\$valueof\((.*?)\)/fromUtf8($som->valueof($1||'')||'')/ge;
 
     if ($line =~ /\$value\b/) {
       my $value = $dataItem->value() ||'';
@@ -238,7 +240,7 @@ sub stringify {
       } else {
 	push @values, ref($value);
       }
-      $value = join('', @values);
+      $value = fromUtf8(join('', @values));
       $line =~ s/\$value\b/$value/g;
     }
 
@@ -250,5 +252,26 @@ sub stringify {
   return $params->{header}.join($params->{separator}, @lines).$params->{footer};
 }
 
+###############################################################################
+sub toUtf8 {
+  my $text = shift;
+
+  $text = Unicode::MapUTF8::to_utf8(-string=>$text, -charset=>$Foswiki::cfg{Site}{CharSet})
+    if $Foswiki::cfg{Site}{CharSet} !~ /^utf-?8$/i;
+
+  return $text;
+}
+
+###############################################################################
+sub fromUtf8 {
+  my $text = shift;
+
+  $text = Unicode::MapUTF8::from_utf8(-string=>$text, -charset=>$Foswiki::cfg{Site}{CharSet})
+    if $Foswiki::cfg{Site}{CharSet} !~ /^utf-?8$/i;
+
+  return $text;
+}
+
+
 1;
 
diff --git a/lib/Foswiki/Plugins/SoapPlugin/DEPENDENCIES b/lib/Foswiki/Plugins/SoapPlugin/DEPENDENCIES
@@ -1,2 +1,3 @@
 SOAP::Lite,>=0.71,CPAN,Required. install from CPAN
 libxml2,>=2.7.5,,Required.
+Unicode::MapUTF8,>=1.11,cpan,Required.