Changeset 23580 for main/branches/64_bit_Greenstone/greenstone2/perllib/plugins/DirectoryPlugin.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/plugins/DirectoryPlugin.pm (modified) (2 diffs)

main/branches/64_bit_Greenstone/greenstone2/perllib/plugins/DirectoryPlugin.pm

@@ -235 +235 @@
         foreach my $e (keys %$exts) {
         # block the file
-        $self->block_filename($block_hash,"$prefix$e");
+        &util::block_filename($block_hash,"$prefix$e");
         # set up as an associatd file
         print STDERR "  $self->{'plugin_type'}: Associating $prefix$e with $tie_to version\n";
@@ -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