Changeset 23387 for main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

Timestamp:

2010-12-06T13:15:10+13:00 (13 years ago)

Author:

davidb

Message:

Further changes to deal with documents that use different filename encodings on the file-system. Now sets UTF8URL metadata to perform the cross-document look up. Files stored in doc.pm as associated files are now always raw filenames (rather than potentially UTF8 encoded). Storing of filenames seen by HTMLPlug when scanning for files to block on is now done in Unicode aware strings rather than utf8 but unware strings.

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -645 +645 @@
     $utf8_real_filename =~ s/^\\(.*)/$1/i;
 
-    my $real_filename = &util::utf8_to_real_filename($utf8_real_filename);
+##  my $real_filename = &util::utf8_to_real_filename($utf8_real_filename);
+    my $real_filename = $utf8_real_filename;
+    $real_filename = &util::downgrade_if_dos_filename($real_filename);
 
     if (-e $real_filename) {
@@ -692 +694 @@
     $real_filename =~ s/^\\(.*)/$1/i;
 
-    my $raw_filename;
-    if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
-        # Need to generate DOS version of filename to test in '-e $raw_filename' below
-        require Win32;
-        my $unicode_filename = Encode::decode("utf8",$real_filename);
-###     print STDERR "***### files to field: ", &unicode::debug_unicode_string($unicode_filename),"\n";
-
-        $raw_filename = Win32::GetShortPathName($unicode_filename);
-    }
-    else {
-        $raw_filename = $real_filename;
-    }
+    my $raw_filename = &util::downgrade_if_dos_filename($real_filename);
 
     if (-e $raw_filename) {