DeliveryOrder: eval_json_result nach transfer_stock

[mfinanz.git] / SL / Iconv.pm

diff --git a/SL/Iconv.pm b/SL/Iconv.pm
index c2f2247eab9ed516ec1aac2ef70db3b02456cd22..aba271a0a226d7d03bc7f1cdda949bc9165a1769 100644 (file)
--- a/SL/Iconv.pm
+++ b/SL/Iconv.pm
@@ -19,7 +19,7 @@ sub new {
   return $self;
 }
 
   return $self;
 }
 

-sub get_converter {
+sub _get_converter {

   my ($from_charset, $to_charset) = @_;
 
   my $index             = join $SUBSCRIPT_SEPARATOR, $from_charset, $to_charset;
   my ($from_charset, $to_charset) = @_;
 
   my $index             = join $SUBSCRIPT_SEPARATOR, $from_charset, $to_charset;


@@ -33,11 +33,14 @@ sub convert {
 
   my ($from_charset, $to_charset, $text) = @_;
 
 
   my ($from_charset, $to_charset, $text) = @_;
 

-  $from_charset ||= Common::DEFAULT_CHARSET;
-  $to_charset   ||= Common::DEFAULT_CHARSET;
+  $from_charset ||= 'UTF-8';
+  $to_charset   ||= 'UTF-8';

 
 

-  my $converter = get_converter($from_charset, $to_charset);
-  return $converter->convert($text);
+  my $converter = _get_converter($from_charset, $to_charset);
+  $text         = $converter->convert($text);
+  $text         = decode("utf-8-strict", $text) if ($to_charset =~ m/^utf-?8$/i) && !Encode::is_utf8($text);
+
+  return $text;

 }
 
 sub _convert {
 }
 
 sub _convert {