Changeset 31493 for main

Timestamp:

2017-03-13T12:05:44+13:00 (7 years ago)

Author:

kjdon

Message:

removed smart_block option. Its been deprecated for long enough

File:

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

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

@@ -120 +120 @@
     'type' => "flag",
     'reqd' => "no" },
-#      { 'name' => "filename_encoding",
-#   'desc' => "{BaseImporter.filename_encoding}",
-#   'type' => "enum",
-#   'deft' => "auto",
-#   'list' => $encoding_plus_auto_list,
-#   'reqd' => "no" },
-      { 'name' => "smart_block",
-        'desc' => "{common.deprecated}. {BaseImporter.smart_block}",
-        'type' => "flag",
-        'reqd' => "no",
-    'hiddengli' => "yes" }, # deprecated, but leave in for old collections
-      { 'name' => "file_rename_method",
+     { 'name' => "file_rename_method",
     'desc' => "{BaseImporter.file_rename_method}",
     'type' => "enum",
@@ -163 +152 @@
         return bless $self, $class;
     }
-    if ($self->{'smart_block'}) {
-    print STDERR "WARNING: -smart_block option has been deprecated and is no longer useful\n";
-    }
-    $self->{'smart_block'} = undef;
 
     my $plugin_name = (defined $pluginlist->[0]) ? $pluginlist->[0] : $class;