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

Timestamp:

2010-12-01T11:42:27+13:00 (13 years ago)

Author:

davidb

Message:

Plugin code upgrade to support Greenstone working with filenames under Windows when then go beyond Latin-1 and start turning up in their DOS abbreviated form (e.g. Test~1.txt)

File:

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

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

@@ -640 +640 @@
     $dir = "" unless defined $dir;
         
-    
-    my $real_filename = $assoc_file_rec->[0];
+    my $utf8_real_filename = $assoc_file_rec->[0];
+
     # for some reasons the image associate file has / before the full path
-    $real_filename =~ s/^\\(.*)/$1/i;
+    $utf8_real_filename =~ s/^\\(.*)/$1/i;
+
+    my $real_filename = &util::utf8_to_real_filename($utf8_real_filename);
+
     if (-e $real_filename) {
 
@@ -653 +656 @@
                      "gsdlassocfile",
                      "$afile:$assoc_file_rec->[2]:$dir");
-    } elsif ($self->{'verbosity'} > 2) {
+    } elsif ($self->{'verbosity'} > 1) {
         print $outhandle "BasePlugout::process couldn't copy the associated file " .
         "$real_filename to $afile\n";
@@ -688 +691 @@
     # for some reasons the image associate file has / before the full path
     $real_filename =~ s/^\\(.*)/$1/i;
-    if (-e $real_filename) {
+
+    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;
+    }
+
+    if (-e $raw_filename) {
 
 #       if (defined $collect_dir) {
@@ -701 +718 @@
         $reverse_lookups->{$real_filename} = 1;
         }
-        push(@{$oid_files->{$field}},$full_file);
+###     push(@{$oid_files->{$field}},$full_file);
+        push(@{$oid_files->{$field}},$raw_filename);
     }
     else {