Changeset 23419 for main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

Timestamp:

2010-12-09T00:10:10+13:00 (13 years ago)

Author:

max

Message:

Setting the values to store as block files is now done through an API call to BasePlugin. This way, anything uniform requirement (such as putting in both C:\... and c:\... entries for Windows) can be done in one place.

File:

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

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

@@ -281 +281 @@
 
         # Allow for possibility of raw byte version and Unicode versions of file
-        $block_hash->{'file_blocks'}->{$unicode_url_original_filename} = 1;
-
+        $self->block_filename($block_hash,$unicode_url_original_filename);
     }
 
     # $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
     
-    
-    $block_hash->{'file_blocks'}->{$url_original_filename} = 1;
-    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
-        
-        my $lower_drive = $url_original_filename;
-        $lower_drive =~ s/^([A-Z]):/\l$1:/i;
-        my $upper_drive = $url_original_filename;
-        
-        $upper_drive =~ s/^([A-Z]):/\u$1:/i;
-
-##      print STDERR "**** HTML plugin, blocking: \"$lower_drive\"\n";
-##      print STDERR "**** HTML plugin, blocking: \"$upper_drive\"\n";
-        
-        $block_hash->{'file_blocks'}->{$lower_drive} = 1;
-        $block_hash->{'file_blocks'}->{$upper_drive} = 1;       
-    }
-    else {
-##      print STDERR "**** HTML plugin, blocking: $url_original_filename\n";
-        $block_hash->{'file_blocks'}->{$url_original_filename} = 1;
-    }
+    $self->block_filename($block_hash,$url_original_filename);
         
     }