Changeset 31476 for main/trunk

Timestamp:

2017-03-09T14:31:23+13:00 (7 years ago)

Author:

kjdon

Message:

blocking moved to EncodingUTil

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (3 diffs)

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

@@ -87 +87 @@
     'deft' => "",
     'reqd' => "no" },
-      { 'name' => "no_blocking",
-    'desc' => "{BasePlugin.no_blocking}",
-    'type' => "flag",
-    'reqd' => "no"},
-      { 'name' => "block_exp",
-    'desc' => "{BasePlugin.block_exp}",
-    'type' => "regexp",
-    'deft' => "",
-    'reqd' => "no" },
-      { 'name' => "store_original_file",
+     { 'name' => "store_original_file",
     'desc' => "{BasePlugin.store_original_file}",
     'type' => "flag",
@@ -391 +382 @@
 
     if ($self->{'block_exp'} ne "" && $filename_full_path =~ /$self->{'block_exp'}/) {
-    &util::block_filename($block_hash,$filename_full_path);
+    $self->block_filename($block_hash,$filename_full_path);
     }
 
@@ -415 +406 @@
     }   
     if (&FileUtils::fileExists($coverfile)) {
-        &util::block_filename($block_hash,$coverfile);
+        $self->block_filename($block_hash,$coverfile);
     } 
     }