Changeset 31443 for main

Timestamp:

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

Author:

ak19

Message:

when we check a filename in the block hash we are converting to windows long filenames, so lets make sure things going into hash are long filenames

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -838 +838 @@
     
     if (($ENV{'GSDLOS'} =~ m/^windows$/) && ($^O ne "cygwin")) {
-    
-    # lower case the entire thing, eg for cover.jpg when its actually cover.JPG
-    my $lower_filename = lc($filename);
-    $block_hash->{'file_blocks'}->{$lower_filename} = 1;
+       # block hash contains long names, lets make sure that we were passed a long name
+       $filename = &util::upgrade_if_dos_filename($filename);
+       # lower case the entire thing, eg for cover.jpg when its actually cover.JPG
+       my $lower_filename = lc($filename);
+       $block_hash->{'file_blocks'}->{$lower_filename} = 1;
+    
 #   my $lower_drive = $filename;
 #   $lower_drive =~ s/^([A-Z]):/\l$1:/i;