Changeset 24564

Show
Ignore:
Timestamp:
06.09.2011 16:07:56 (8 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

    r24404 r24564  
    789789 
    790790    if (defined $char_encoding) { 
    791         if ($char_encoding =~ m/^(iso)(8859)(\d{1,2})$/) { 
     791        if ($char_encoding =~ m/^(iso)(8859)-?(\d{1,2})$/) { 
    792792        $char_encoding = "$1\_$2\_$3"; 
    793793        }