Changeset 24564

Timestamp:

2011-09-06T16:07:56+12:00 (13 years ago)

Author:

ak19

Message:

Fixed a bug detected on Ubuntu: the string iso8859-1, as obtained from the locale, wasn't being recognised, since it failed a regex match and so wasn't converted to iso_8859_1, which would have been recognised.

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (1 diff)

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

@@ -789 +789 @@
 
     if (defined $char_encoding) {
-        if ($char_encoding =~ m/^(iso)(8859)(\d{1,2})$/) {
+        if ($char_encoding =~ m/^(iso)(8859)-?(\d{1,2})$/) {
         $char_encoding = "$1\_$2\_$3";
         }