Ignore:
Timestamp:
2017-03-13T11:12:37+13:00 (7 years ago)
Author:
kjdon
Message:

renamed EncodingUtil to CommonUtil, BasePlugin to BaseImporter. The idea is that only top level plugins that you can specify in your collection get to have plugin in their name. Modified all other plugins to reflect these name changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm

    r31480 r31492  
    169169my $arguments =
    170170    [ { 'name' => "process_exp",
    171     'desc' => "{BasePlugin.process_exp}",
     171    'desc' => "{BaseImporter.process_exp}",
    172172    'type' => "string",
    173173    'deft' => &get_default_process_exp(),
     
    188188#   'reqd' => "no" },
    189189      {'name' => "processing_tmp_files",
    190        'desc' => "{BasePlugin.processing_tmp_files}",
     190       'desc' => "{BaseImporter.processing_tmp_files}",
    191191       'type' => "flag",
    192192       'hiddengli' => "yes"}
     
    228228    my $rxf_self = new ReadXMLFile($pluginlist, $inputargs, $hashArgOptLists);
    229229
    230     my $self = BasePlugin::merge_inheritance($imc_self,$rtf_self,$rxf_self);
     230    my $self = BaseImporter::merge_inheritance($imc_self,$rtf_self,$rxf_self);
    231231
    232232    # Update $self used by XML::Parser so it finds callback functions
     
    275275
    276276
    277 # want to use BasePlugin's version of this, not ReadXMLFile's
     277# want to use BaseImporter's version of this, not ReadXMLFile's
    278278sub can_process_this_file {
    279279    my $self = shift(@_);
    280     return $self->BasePlugin::can_process_this_file(@_);
     280    return $self->BaseImporter::can_process_this_file(@_);
    281281}
    282282
     
    307307}
    308308
    309 # we want to use BasePlugin's read, not ReadXMLFile's
     309# we want to use BaseImporter's read, not ReadXMLFile's
    310310sub read
    311311{
    312312    my $self = shift (@_);
    313313
    314     $self->BasePlugin::read(@_);
     314    $self->BaseImporter::read(@_);
    315315}
    316316
Note: See TracChangeset for help on using the changeset viewer.