Changeset 23364 for main/trunk/greenstone2

Timestamp:

2010-12-01T13:13:56+13:00 (13 years ago)

Author:

sjm84

Message:

C and Posix added to the possible locales as well as removing the possibility that the filename encoding will come out as "undefined"

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -654 +654 @@
     if (!defined $self->{'filesystem_encoding'}) {
     $self->{'filesystem_encoding'} = $self->get_filesystem_encoding();
-    $self->{'filesystem_encoding'} = "undefined" if !defined $self->{'filesystem_encoding'};
     }
 
@@ -760 +759 @@
     my $current_locale = setlocale(LC_CTYPE);
     
-    if ($current_locale =~ m/^.*\.(.*?)$/) {
-        my $char_encoding = lc($1);
+    my $char_encoding = undef;
+    if ($current_locale =~ m/\./) {
+        ($char_encoding) = ($current_locale =~ m/^.*\.(.*?)$/);
+        $char_encoding = lc($char_encoding);
+    }
+    else {
+        if ($current_locale =~ m/^(posix|c)$/i) {
+        $char_encoding = "ascii";
+        }
+    }
+
+    if (defined $char_encoding) {
         if ($char_encoding =~ m/^(iso)(8859)(\d{1,2})$/) {
         $char_encoding = "$1\_$2\_$3";
@@ -942 +951 @@
 
     my $url_encoded_filename;
-    if (defined $filename_encoding) {
+    if ((defined $filename_encoding) && ($filename_encoding ne "ascii")) {
     # => Generate a pretty print version of filename that is mapped to Unicode