Changeset 23580 for main/branches/64_bit_Greenstone/greenstone2/perllib/util.pm

Timestamp:

2011-01-14T09:53:23+13:00 (13 years ago)

Author:

sjm84

Message:

Merging the latest trunk changes into this branch

Location:

main/branches/64_bit_Greenstone/greenstone2

Files:

• . (modified) (1 prop)
• perllib/util.pm (modified) (1 diff)

main/branches/64_bit_Greenstone/greenstone2/perllib/util.pm

@@ -1140 +1140 @@
 }
 
+sub block_filename
+{
+    my ($block_hash,$filename) = @_;
+    
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+    
+    # 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;
+    
+#   my $upper_drive = $filename;
+#   $upper_drive =~ s/^([A-Z]):/\u$1:/i;
+#   
+#   $block_hash->{'file_blocks'}->{$lower_drive} = 1;
+#   $block_hash->{'file_blocks'}->{$upper_drive} = 1;       
+    }
+    else {
+    $block_hash->{'file_blocks'}->{$filename} = 1;
+    }
+}
+
 
 sub filename_is_absolute