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

Timestamp:

2017-03-09T14:35:57+13:00 (7 years ago)

Author:

kjdon

Message:

util::block_file moved to EncodingUtil::block_raw_filename

File:

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

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

@@ -290 +290 @@
         if($unicode_url_original_filename ne $unicode_html_fname) {
             # Allow for possibility of raw byte version and Unicode versions of file
-            &util::block_filename($block_hash,$unicode_url_original_filename);
+            $self->block_filename($block_hash,$unicode_url_original_filename);
         }
     }
 
     # $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
-    &util::block_filename($block_hash,$url_original_filename) if $url_original_filename ne $html_fname;
+    # TODO now use unicode files in block, do we need this??
+    #$self->block_raw_filename($block_hash,$url_original_filename) if $url_original_filename ne $html_fname;
 
     # but only add the linked file to the blocklist if the current html file does not link to itself
@@ -1292 +1293 @@
         $unicode_dirname = &unicode::raw_filename_to_url_encoded($dirname);
         }
-    
+        print STDERR "unicode dirname = ".&unicode::debug_unicode_string($unicode_dirname)."\n";
         $before_hash = &FileUtils::filenameConcatenate($unicode_dirname, $before_hash);
         $before_hash = $self->eval_dir_dots($before_hash);