Changeset 31446 for main/trunk/greenstone2/perllib

Timestamp:

2017-02-27T14:39:50+13:00 (7 years ago)

Author:

ak19

Message:

use guess_filesystem_encoding instead of utf8 hard coded. hope it works back on linux, and on mac!

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)

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

@@ -1280 +1280 @@
 
         my $unicode_dirname ="";
-        #my $content_encoding = $self->{'content_encoding'};
-        #my $language = $self->{'language'};
-
-        # actually I think this is wrong. why should we use content encoding?
-        #$self->decode_text($dirname, $content_encoding, $language, \$unicode_dirname);
-        #my $filename_encoding = $self->{'filename_encoding'};
-        # filename_encoding might be auto...
-
-        # TODO what is the best thing to do here?????
-        # try and guess default filesystem encoding, similar to deduce_filename_encoding, but without a file?
-        my $filename_encoding = "utf8";
+        # we need to turn raw filesystem filename into perl unicode aware string  
+        my $filename_encoding =  $self->guess_filesystem_encoding();  
+        
         # copied this from set_Source_metadata in BasePlugin
         if ((defined $filename_encoding) && ($filename_encoding ne "ascii")) {
@@ -1300 +1292 @@
         $unicode_dirname = &unicode::raw_filename_to_url_encoded($dirname);
         }
- 
+    
         $before_hash = &FileUtils::filenameConcatenate($unicode_dirname, $before_hash);
         $before_hash = $self->eval_dir_dots($before_hash);