Changeset 31444 for main/trunk

Timestamp:

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

Author:

ak19

Message:

block hash filenames should be windows long names

File:

• main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm (modified) (3 diffs)

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

@@ -179 +179 @@
 
     if (-f $filename && $self->SUPER::can_process_this_file($filename) && $self->check_doctype($filename)) {
-    return 1; # its a file for us
-    }
-
+       return 1; # its a file for us
+    }
     return 0;
 }
@@ -222 +221 @@
 
     if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) {
-    
+        # convert to full name - paths stored in block hash are long filenames
+    $filename_full_path = &util::upgrade_if_dos_filename($filename_full_path);
     my $lower_drive = $filename_full_path;
     $lower_drive =~ s/^([A-Z]):/\l$1:/i;
@@ -230 +230 @@
     
     $block_hash->{'metadata_files'}->{$lower_drive} = 1;
-    $block_hash->{'metadata_files'}->{$upper_drive} = 1;        
+    $block_hash->{'metadata_files'}->{$upper_drive} = 1;
+        
     }
     else {