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

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

@@ -382 +382 @@
 }
 
-sub block_filename
-{
-    my $self = shift(@_);
-    my ($block_hash,$filename) = @_;
-    
-    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
-    
-    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;
-    }
-}
 
 # rename imported files and assoc files using URL encoding by default
@@ -438 +418 @@
 
     if ($self->{'block_exp'} ne "" && $filename_full_path =~ /$self->{'block_exp'}/) {
-    $self->block_filename($block_hash,$filename_full_path);
+    &util::block_filename($block_hash,$filename_full_path);
     }
 
@@ -458 +438 @@
     }   
     if (&util::fd_exists($coverfile)) {
-        $self->block_filename($block_hash,$coverfile);
+        &util::block_filename($block_hash,$coverfile);
     } 
     }