Changeset 23544

Timestamp:

2011-01-10T15:07:51+13:00 (13 years ago)

Author:

kjdon

Message:

on windows, if have a .JPG cover image, then a -e xxx.jpg test works, but if that filename is put into the block list, it won't match later on the .JPG, and the file won't be blocked. Solution, lowercase entirefilepath before adding into or checking in the block_hash->file_blocks list. but only for windows. Now don't need the alternative A: a: options for drive letters.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BasePlugin.pm (modified) (1 diff)
• DirectoryPlugin.pm (modified) (1 diff)

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

@@ -389 +389 @@
     if ($ENV{'GSDLOS'} =~ m/^windows$/) {
     
-    my $lower_drive = $filename;
-    $lower_drive =~ s/^([A-Z]):/\l$1:/i;
+    # 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;       
+#   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 {

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

@@ -260 +260 @@
 ###    print STDERR "*** DirectoryPlugin::file_is_blocked $filename_full_path\n";
 
-    if (defined $block_hash->{'file_blocks'}->{$filename_full_path}) {
-    $self->{'num_blocked'} ++;
-    return 1;
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+    # on windows, all block paths are lowercased.
+    my $lower_filename = lc ($filename_full_path);
+    if (defined $block_hash->{'file_blocks'}->{$lower_filename}) {
+        $self->{'num_blocked'} ++;
+        return 1;
+    }
+    }
+    else {
+    if (defined $block_hash->{'file_blocks'}->{$filename_full_path}) {
+        $self->{'num_blocked'} ++;
+        return 1;
+    }
     }
     # check Directory plugin's own block_exp