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

Timestamp:

2011-01-13T11:49:38+13:00 (13 years ago)

Author:

kjdon

Message:

moved the block_filename from BasePlugin into util. then I don't need to duplicate it for DirectoryPlugin which doesn't inherit from BasePlugin

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)

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

@@ -180 +180 @@
 
     my $html_fname = $filename_full_path;
-    my @file_blocks;
     
     my ($language, $content_encoding) = $self->textcat_get_language_encoding ($filename_full_path);
@@ -281 +280 @@
 
         # Allow for possibility of raw byte version and Unicode versions of file
-        $self->block_filename($block_hash,$unicode_url_original_filename);
+        &util::block_filename($block_hash,$unicode_url_original_filename);
     }
 
     # $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
     
-    $self->block_filename($block_hash,$url_original_filename);
+    &util::block_filename($block_hash,$url_original_filename);
         
     }