Changeset 9969

Timestamp:

2005-05-26T13:31:30+12:00 (19 years ago)

Author:

jrm21

Message:

better error checking if an encoding conversion failed.

on !windows platforms, look at the locale to choose the best output
encoding.

File:

• trunk/gsdl/perllib/gsprintf.pm (modified) (2 diffs)

trunk/gsdl/perllib/gsprintf.pm

@@ -102 +102 @@
 
     # If an 8-bit output encoding has been defined, encode the string appropriately
-    return &unicode::unicode2singlebyte(&unicode::utf82unicode($utf8string), $outputencoding);
+    my $encoded=unicode::unicode2singlebyte(&unicode::utf82unicode($utf8string), $outputencoding);
+    
+    # If we successfully encoded it, return it
+    if ($encoded) { return $encoded }
+
+    # Otherwise, we can't convert to the requested encoding. return the utf8?
+    $specialoutputencoding='utf8';
+    return $utf8string;
 }
 
@@ -123 +130 @@
     }
     else {
+    # see if there is an encoding set in the appropriate locale env var
+
+    foreach my $envvar ('LC_ALL', 'LANG') {
+        if (!exists $ENV{$envvar}) { next }
+        my $locale=$ENV{$envvar};
+        if ($locale !~ /^\w+\.(.+)$/) { next }
+        my $enc=lc($1);
+        $enc =~ s/-/_/g;
+        if ($enc eq 'utf_8') { $enc='utf8' } # normalise to this name
+        $specialoutputencoding = $enc;
+        return;
+    }
     $specialoutputencoding = $specialresourcebundle{"{OutputEncoding.unix}"};
     }