Changeset 29760 for main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

Timestamp:

2015-02-23T14:09:06+13:00 (9 years ago)

Author:

kjdon

Message:

try decoding against locale rather than utf8. will this work on wondows/mac?? need to test there. locale is a special thing provided by Encoding::Locale

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (4 diffs)

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

@@ -42 +42 @@
 no strict 'subs';
 
+use Encode::Locale;
 use Encode;
 
@@ -333 +334 @@
     # Recursively read each $raw_subfile
     print $outhandle "DirectoryPlugin block recurring: ". Encode::decode("utf8", $raw_file_subfile) ."\n" if ($verbosity > 2);
+    print $outhandle "DirectoryPlugin block recurring: ". Encode::decode(locale =>$raw_file_subfile) ."\n" if ($verbosity > 2);
     
     #$count += &plugin::file_block_read ($pluginfo, $this_file_base_dir,
@@ -541 +543 @@
     my $this_file_base_dir = $base_dir;
     my $raw_subfile = &unicode::url_encoded_to_raw_filename($subfile);
-    my $unicode_subfile = &Encode::decode("utf8", $raw_subfile);
-
+    #my $unicode_subfile = &Encode::decode("utf8", $raw_subfile);
+    my $unicode_subfile = &Encode::decode(locale => $raw_subfile);
+    
     my $raw_file_subfile = &FileUtils::filenameConcatenate($file, $raw_subfile);
     my $raw_full_filename 
@@ -604 +607 @@
         foreach my $filespec (@extrametakeys) {
         ## use the url-encoded filename to do the filename comparison
-        print STDERR "comparing against filespec $filespec\n";
-        print STDERR &unicode::debug_unicode_string("comparing against filespec $filespec\n");
+        print STDERR "comparing against filespec $filespec (";
+        print STDERR &unicode::debug_unicode_string("$filespec");
+        print STDERR ")\n";
         if ($unicode_subfile =~ /^$filespec$/) {
         ###if ($lookup_name =~ /^$filespec$/) {