Ignore:
Timestamp:
03/13/17 11:12:37 (4 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

Location:
main/trunk/greenstone2/perllib/plugins
Files:
55 edited
2 moved

Legend:

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

    r31479 r31492  
    3333use FileUtils;
    3434use doc;
    35 use EncodingUtil;
     35use CommonUtil;
    3636use plugin;
    3737use arcinfo;
     
    4343
    4444BEGIN {
    45     @ArchivesInfPlugin::ISA = ('EncodingUtil');
     45    @ArchivesInfPlugin::ISA = ('CommonUtil');
    4646}
    4747
     
    7979    push(@{$hashArgOptLists->{"OptList"}},$options);
    8080
    81     my $self = new EncodingUtil($pluginlist, $inputargs, $hashArgOptLists);
     81    my $self = new CommonUtil($pluginlist, $inputargs, $hashArgOptLists);
    8282
    8383    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/AutoExtractMetadata.pm

    r22859 r31492  
    2525
    2626# This plugin uses the supporting Extractors to add metadata extraction
    27 # functionality to BasePlugin.
     27# functionality to BaseImporter.
    2828
    2929
     
    3434no strict 'refs'; # allow filehandles to be variables and viceversa
    3535
    36 use BasePlugin;
     36use BaseImporter;
    3737use AcronymExtractor;
    3838use KeyphraseExtractor;
     
    4242
    4343sub BEGIN {
    44     @AutoExtractMetadata::ISA = ( 'BasePlugin', 'AcronymExtractor', 'KeyphraseExtractor', 'EmailAddressExtractor', 'DateExtractor','GISExtractor' );
     44    @AutoExtractMetadata::ISA = ( 'BaseImporter', 'AcronymExtractor', 'KeyphraseExtractor', 'EmailAddressExtractor', 'DateExtractor','GISExtractor' );
    4545}
    4646
     
    7676    new DateExtractor($pluginlist, $inputargs, $hashArgOptLists);
    7777    new GISExtractor($pluginlist, $inputargs, $hashArgOptLists);
    78     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists,$auxiliary);
     78    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists,$auxiliary);
    7979
    8080    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/AutoLoadConverters.pm

    r24728 r31492  
    117117    my $pi_self = new PrintInfo($pluginlist, $inputargs, $hashArgOptLists, 1);
    118118    push (@self_array, $pi_self);
    119     $self = BasePlugin::merge_inheritance(@self_array);
     119    $self = BaseImporter::merge_inheritance(@self_array);
    120120
    121121    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/BaseImporter.pm

    r31491 r31492  
    11###########################################################################
    22#
    3 # BasePlugin.pm -- base class for all the import plugins
     3# BaseImporter.pm -- base class for all the import plugins
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
     
    2424###########################################################################
    2525
    26 package BasePlugin;
     26package BaseImporter;
    2727
    2828use strict;
     
    4242use FileUtils;
    4343
    44 use EncodingUtil;
     44use CommonUtil;
    4545
    4646BEGIN {
    47     @BasePlugin::ISA = ( 'EncodingUtil' );
     47    @BaseImporter::ISA = ( 'CommonUtil' );
    4848}
    4949
     
    5252our $file_rename_method_list =
    5353    [ { 'name' => "url",
    54     'desc' => "{BasePlugin.rename_method.url}" },
     54    'desc' => "{BaseImporter.rename_method.url}" },
    5555      { 'name' => "base64",
    56     'desc' => "{BasePlugin.rename_method.base64}" },
     56    'desc' => "{BaseImporter.rename_method.base64}" },
    5757      { 'name' => "none",
    58     'desc' => "{BasePlugin.rename_method.none}",
     58    'desc' => "{BaseImporter.rename_method.none}",
    5959    'hiddengli' => "yes" } ];
    6060
     
    6363our $oidtype_list =
    6464    [ { 'name' => "auto",
    65     'desc' => "{BasePlugin.OIDtype.auto}" },
     65    'desc' => "{BaseImporter.OIDtype.auto}" },
    6666      { 'name' => "hash",
    6767        'desc' => "{import.OIDtype.hash}" },
     
    8383my $arguments =
    8484    [ { 'name' => "process_exp",
    85     'desc' => "{BasePlugin.process_exp}",
     85    'desc' => "{BaseImporter.process_exp}",
    8686    'type' => "regexp",
    8787    'deft' => "",
    8888    'reqd' => "no" },
    8989     { 'name' => "store_original_file",
    90     'desc' => "{BasePlugin.store_original_file}",
     90    'desc' => "{BaseImporter.store_original_file}",
    9191    'type' => "flag",
    9292    'reqd' => "no" },
    9393      { 'name' => "associate_ext",
    94     'desc' => "{BasePlugin.associate_ext}",
     94    'desc' => "{BaseImporter.associate_ext}",
    9595    'type' => "string",
    9696    'reqd' => "no" },
    9797      { 'name' => "associate_tail_re",
    98     'desc' => "{BasePlugin.associate_tail_re}",
     98    'desc' => "{BaseImporter.associate_tail_re}",
    9999    'type' => "string",
    100100    'reqd' => "no" },
     
    112112    'reqd' => "no" },     
    113113#      { 'name' => "use_as_doc_identifier",
    114 #   'desc' => "{BasePlugin.use_as_doc_identifier}",
     114#   'desc' => "{BaseImporter.use_as_doc_identifier}",
    115115#   'type' => "string",
    116116#   'reqd' => "no" ,
    117117#   'deft' => "" } ,
    118118      { 'name' => "no_cover_image",
    119     'desc' => "{BasePlugin.no_cover_image}",
     119    'desc' => "{BaseImporter.no_cover_image}",
    120120    'type' => "flag",
    121121    'reqd' => "no" },
    122122#      { 'name' => "filename_encoding",
    123 #   'desc' => "{BasePlugin.filename_encoding}",
     123#   'desc' => "{BaseImporter.filename_encoding}",
    124124#   'type' => "enum",
    125125#   'deft' => "auto",
     
    127127#   'reqd' => "no" },
    128128      { 'name' => "smart_block",
    129         'desc' => "{common.deprecated}. {BasePlugin.smart_block}",
     129        'desc' => "{common.deprecated}. {BaseImporter.smart_block}",
    130130        'type' => "flag",
    131131        'reqd' => "no",
    132132    'hiddengli' => "yes" }, # deprecated, but leave in for old collections
    133133      { 'name' => "file_rename_method",
    134     'desc' => "{BasePlugin.file_rename_method}",
     134    'desc' => "{BaseImporter.file_rename_method}",
    135135    'type' => "enum",
    136136    'deft' => &get_default_file_rename_method(), # by default rename imported files and assoc files using this encoding
     
    142142
    143143
    144 my $options = { 'name'     => "BasePlugin",
    145         'desc'     => "{BasePlugin.desc}",
     144my $options = { 'name'     => "BaseImporter",
     145        'desc'     => "{BaseImporter.desc}",
    146146        'abstract' => "yes",
    147147        'inherits' => "yes",
     
    157157    push(@{$hashArgOptLists->{"OptList"}},$options);
    158158
    159     my $self = new EncodingUtil($pluginlist, $inputargs, $hashArgOptLists,$auxiliary);
     159    my $self = new CommonUtil($pluginlist, $inputargs, $hashArgOptLists,$auxiliary);
    160160   
    161161    if ($self->{'info_only'}) {
     
    238238}
    239239
    240 # initialize BasePlugin options
    241 # if init() is overridden in a sub-class, remember to call BasePlugin::init()
     240# initialize BaseImporter options
     241# if init() is overridden in a sub-class, remember to call BaseImporter::init()
    242242sub init {
    243243    my $self = shift (@_);
     
    612612}
    613613
    614 # The BasePlugin read_into_doc_obj() function. This function does all the
     614# The BaseImporter read_into_doc_obj() function. This function does all the
    615615# right things to make general options work for a given plugin.  It doesn't do anything with the file other than setting reads in
    616616# a file and sets up a slew of metadata all saved in doc_obj, which
     
    694694
    695695    # lookup_string with extra '1' arg returns perl internal unicode aware text, so we use add_utf8_text so no encoding is done on it.
    696     $doc_obj->add_utf8_text($section, &gsprintf::lookup_string("{BasePlugin.dummy_text}",1));
    697     #$doc_obj->add_text($section, &gsprintf::lookup_string("{BasePlugin.dummy_text}",1));
     696    $doc_obj->add_utf8_text($section, &gsprintf::lookup_string("{BaseImporter.dummy_text}",1));
     697    #$doc_obj->add_text($section, &gsprintf::lookup_string("{BaseImporter.dummy_text}",1));
    698698   
    699699   
     
    740740
    741741
    742 # The BasePlugin read() function. This function calls read_into_doc_obj()
     742# The BaseImporter read() function. This function calls read_into_doc_obj()
    743743# to ensure all the right things to make general options work for a
    744744# given plugin are done. It then calls the process() function which
     
    790790    my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
    791791
    792     gsprintf(STDERR, "BasePlugin::process {common.must_be_implemented}\n");
     792    gsprintf(STDERR, "BaseImporter::process {common.must_be_implemented}\n");
    793793
    794794    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(1);
  • main/trunk/greenstone2/perllib/plugins/BibTexPlugin.pm

    r24548 r31492  
    5656my $arguments =
    5757    [ { 'name' => "process_exp",
    58     'desc' => "{BasePlugin.process_exp}",
     58    'desc' => "{BaseImporter.process_exp}",
    5959    'type' => "regexp",
    6060    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/BookPlugin.pm

    r15872 r31492  
    6262my $arguments =
    6363    [ { 'name' => "process_exp",
    64     'desc' => "{BasePlugin.process_exp}",
     64    'desc' => "{BaseImporter.process_exp}",
    6565    'type' => "regexp",
    6666    'reqd' => "no",
    6767    'deft' => &get_default_process_exp() },
    6868      { 'name' => "block_exp",
    69     'desc' => "{BasePlugin.block_exp}",
     69    'desc' => "{BaseImporter.block_exp}",
    7070    'type' => "regexp",
    7171    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/CONTENTdmPlugin.pm

    r28563 r31492  
    7171    'reqd' => "no" },
    7272       { 'name' => "process_exp",
    73     'desc' => "{BasePlugin.process_exp}",
     73    'desc' => "{BaseImporter.process_exp}",
    7474    'type' => "regexp",
    7575    'deft' => &get_default_process_exp(),
    7676    'reqd' => "no" },
    7777      { 'name' => "block_exp",
    78     'desc' => "{BasePlugin.block_exp}",
     78    'desc' => "{BaseImporter.block_exp}",
    7979    'type' => "regexp",
    8080    'deft' => &get_default_block_exp() }
     
    585585
    586586
    587 # Override ConvertBinaryFile (ie BasePlugin) read
     587# Override ConvertBinaryFile (ie BaseImporter) read
    588588# Needed so multiple .item files generated are sent down secondary plugin
    589589# and the resulting doc_objs all processed.
  • main/trunk/greenstone2/perllib/plugins/CSVPlugin.pm

    r28782 r31492  
    4242my $arguments =
    4343    [ { 'name' => "process_exp",
    44     'desc' => "{BasePlugin.process_exp}",
     44    'desc' => "{BaseImporter.process_exp}",
    4545    'type' => "regexp",
    4646    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/CommonUtil.pm

    r31491 r31492  
    11###########################################################################
    22#
    3 # EncodingUtil.pm -- base class for file and directory plugins - aims to
    4 # handle all encoding stuff, to keep it in one place
     3# CommonUtil.pm -- base class for file and directory plugins - aims to
     4# handle all encoding stuff, blocking stuff, to keep it in one place
    55# A component of the Greenstone digital library software
    66# from the New Zealand Digital Library Project at the
     
    2525###########################################################################
    2626
    27 package EncodingUtil;
     27package CommonUtil;
    2828
    2929use strict;
     
    3939
    4040BEGIN {
    41     @EncodingUtil::ISA = ( 'PrintInfo' );
     41    @CommonUtil::ISA = ( 'PrintInfo' );
    4242}
    4343
    4444our $encoding_list =
    4545    [ { 'name' => "ascii",
    46     'desc' => "{BasePlugin.encoding.ascii}" },
     46    'desc' => "{BaseImporter.encoding.ascii}" },
    4747      { 'name' => "utf8",
    48     'desc' => "{BasePlugin.encoding.utf8}" },
     48    'desc' => "{BaseImporter.encoding.utf8}" },
    4949      { 'name' => "unicode",
    50     'desc' => "{BasePlugin.encoding.unicode}" } ];
     50    'desc' => "{BaseImporter.encoding.unicode}" } ];
    5151
    5252
     
    6363our $encoding_plus_auto_list =
    6464    [ { 'name' => "auto",
    65     'desc' => "{BasePlugin.filename_encoding.auto}" },
     65    'desc' => "{BaseImporter.filename_encoding.auto}" },
    6666      { 'name' => "auto-language-analysis",
    67     'desc' => "{BasePlugin.filename_encoding.auto_language_analysis}" }, # textcat
     67    'desc' => "{BaseImporter.filename_encoding.auto_language_analysis}" }, # textcat
    6868      { 'name' => "auto-filesystem-encoding",
    69     'desc' => "{BasePlugin.filename_encoding.auto_filesystem_encoding}" }, # locale
     69    'desc' => "{BaseImporter.filename_encoding.auto_filesystem_encoding}" }, # locale
    7070      { 'name' => "auto-fl",
    71     'desc' => "{BasePlugin.filename_encoding.auto_fl}" }, # locale followed by textcat
     71    'desc' => "{BaseImporter.filename_encoding.auto_fl}" }, # locale followed by textcat
    7272      { 'name' => "auto-lf",
    73     'desc' => "{BasePlugin.filename_encoding.auto_lf}" } ]; # texcat followed by locale
     73    'desc' => "{BaseImporter.filename_encoding.auto_lf}" } ]; # texcat followed by locale
    7474
    7575push(@{$encoding_plus_auto_list},@{$encoding_list});
     
    7777my $arguments =
    7878    [  { 'name' => "block_exp",
    79      'desc' => "{BasePlugin.block_exp}",
     79     'desc' => "{BaseImporter.block_exp}",
    8080     'type' => "regexp",
    8181     'deft' => "",
    8282     'reqd' => "no" },
    8383       { 'name' => "no_blocking",
    84      'desc' => "{BasePlugin.no_blocking}",
     84     'desc' => "{BaseImporter.no_blocking}",
    8585     'type' => "flag",
    8686     'reqd' => "no"},
    8787       { 'name' => "filename_encoding",
    88      'desc' => "{BasePlugin.filename_encoding}",
     88     'desc' => "{BaseImporter.filename_encoding}",
    8989     'type' => "enum",
    9090     'deft' => "auto",
     
    9393    ];
    9494
    95 my $options = { 'name'     => "EncodingUtil",
    96         'desc'     => "{EncodingUtil.desc}",
     95my $options = { 'name'     => "CommonUtil",
     96        'desc'     => "{CommonUtil.desc}",
    9797        'abstract' => "yes",
    9898        'inherits' => "no",
     
    140140    my $filename_encoding =  $self->guess_filesystem_encoding(); 
    141141       
    142     # copied this from set_Source_metadata in BasePlugin
     142    # copied this from set_Source_metadata in BaseImporter
    143143    if ((defined $filename_encoding) && ($filename_encoding ne "ascii")) {
    144144    # Use filename_encoding to map raw filename to a Perl unicode-aware string
     
    267267    my $outhandle = $self->{'outhandle'};
    268268
    269     print $outhandle "****!!!!**** BasePlugin::filename_to_utf8_metadata now deprecated\n";
     269    print $outhandle "****!!!!**** BaseImporter::filename_to_utf8_metadata now deprecated\n";
    270270    my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(0);
    271271    print $outhandle "Calling method: $cfilename:$cline $cpackage->$csubr\n";
     
    363363    {
    364364    if ($self->{'verbosity'}) {
    365         gsprintf($outhandle, "BasePlugin: {ReadTextFile.unsupported_encoding}\n", $text, $best_encoding, "undef");
     365        gsprintf($outhandle, "BaseImporter: {ReadTextFile.unsupported_encoding}\n", $text, $best_encoding, "undef");
    366366    }
    367367    $best_encoding = undef;
  • main/trunk/greenstone2/perllib/plugins/ConvertToRogPlugin.pm

    r28563 r31492  
    309309
    310310
    311 # Override BasePlugin read
     311# Override BaseImporter read
    312312# We don't want to get language encoding stuff until after we've converted
    313313# our file to Rog format
  • main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm

    r31480 r31492  
    6262my $arguments =
    6363    [ { 'name' => "process_exp",
    64     'desc' => "{BasePlugin.process_exp}",
     64    'desc' => "{BaseImporter.process_exp}",
    6565    'type' => "string",
    6666    'deft' => &get_default_process_exp(),
     
    7979    'reqd' => "no" },
    8080      { 'name' => "block_exp",
    81     'desc' => "{BasePlugin.block_exp}",
     81    'desc' => "{BaseImporter.block_exp}",
    8282    'type' => "regexp",
    8383    'deft' => &get_default_block_exp(),
     
    320320
    321321    # Temporarily store associate file info in metadata table
    322     # This will be removed in 'extra_metadata' in BasePlugin and used
     322    # This will be removed in 'extra_metadata' in BaseImporter and used
    323323    # to perform the actual file association (once the doc obj has
    324324    # been formed
  • main/trunk/greenstone2/perllib/plugins/DatabasePlugin.pm

    r24548 r31492  
    4949my $arguments =
    5050    [ { 'name' => "process_exp",
    51     'desc' => "{BasePlugin.process_exp}",
     51    'desc' => "{BaseImporter.process_exp}",
    5252    'type' => "regexp",
    5353    'deft' => &get_default_process_exp(),
     
    260260    my $cursection = $doc_obj->get_top_section();
    261261
    262     # if $language not set in config file, will use BasePlugin's default
     262    # if $language not set in config file, will use BaseImporter's default
    263263    if (defined($language)) {
    264264        $doc_obj->add_utf8_metadata($cursection, "Language", $language);
    265265    }
    266     # if $encoding not set in config file, will use BasePlugin's default
     266    # if $encoding not set in config file, will use BaseImporter's default
    267267    if (defined($encoding)) {
    268268        # allow some common aliases
  • main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

    r31477 r31492  
    3131
    3232use extrametautil;
    33 use EncodingUtil;
     33use CommonUtil;
    3434use plugin;
    3535use util;
     
    4747
    4848BEGIN {
    49     @DirectoryPlugin::ISA = ('EncodingUtil');
     49    @DirectoryPlugin::ISA = ('CommonUtil');
    5050}
    5151
    5252my $arguments =
    5353    [ { 'name' => "block_exp",
    54     'desc' => "{BasePlugin.block_exp}",
     54    'desc' => "{BaseImporter.block_exp}",
    5555    'type' => "regexp",
    5656    'deft' => &get_default_block_exp(),
     
    8181    push(@{$hashArgOptLists->{"OptList"}},$options);
    8282
    83     my $self = new EncodingUtil($pluginlist, $inputargs, $hashArgOptLists);
     83    my $self = new CommonUtil($pluginlist, $inputargs, $hashArgOptLists);
    8484   
    8585    if ($self->{'info_only'}) {
  • main/trunk/greenstone2/perllib/plugins/EmailPlugin.pm

    r28563 r31492  
    8585      ];
    8686
    87 # add in all the standard options from BasePlugin
    88 unshift (@$extended_oidtype_list, @{$BasePlugin::oidtype_list});
     87# add in all the standard options from BaseImporter
     88unshift (@$extended_oidtype_list, @{$BaseImporter::oidtype_list});
    8989
    9090my $arguments =
    9191    [ { 'name' => "process_exp",
    92     'desc' => "{BasePlugin.process_exp}",
     92    'desc' => "{BaseImporter.process_exp}",
    9393    'type' => "regexp",
    9494    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm

    r31474 r31492  
    2828package EmbeddedMetadataPlugin;
    2929
    30 use BasePlugin;
     30use BaseImporter;
    3131use extrametautil;
    3232use util;
     
    4141sub BEGIN
    4242{
    43     @EmbeddedMetadataPlugin::ISA = ('BasePlugin');
     43    @EmbeddedMetadataPlugin::ISA = ('BaseImporter');
    4444    binmode(STDERR, ":utf8");
    4545}
     
    4848        'name' => "auto",
    4949        'desc' => "{ReadTextFile.input_encoding.auto}" }];
    50 push(@{$encoding_plus_auto_list},@{$EncodingUtil::encoding_list});
     50push(@{$encoding_plus_auto_list},@{$CommonUtil::encoding_list});
    5151
    5252my $arguments = [{
     
    104104    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
    105105
    106     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     106    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    107107
    108108    # Create a new Image::ExifTool object
  • main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm

    r23751 r31492  
    4545my $arguments =
    4646    [ { 'name' => "process_exp",
    47     'desc' => "{BasePlugin.process_exp}",
     47    'desc' => "{BaseImporter.process_exp}",
    4848    'type' => "regexp",
    4949    'reqd' => "no",
     
    8787    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
    8888    my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
    89     my $self = BasePlugin::merge_inheritance($auto_converter_self, $cbf_self);
     89    my $self = BaseImporter::merge_inheritance($auto_converter_self, $cbf_self);
    9090
    9191   
  • main/trunk/greenstone2/perllib/plugins/FOXPlugin.pm

    r18327 r31492  
    3131package FOXPlugin;
    3232
    33 use BasePlugin;
     33use BaseImporter;
    3434use util;
    3535use doc;
     
    4141
    4242sub BEGIN {
    43     @FOXPlugin::ISA = ('BasePlugin');
     43    @FOXPlugin::ISA = ('BaseImporter');
    4444}
    4545
    4646my $arguments =
    4747    [ { 'name' => "process_exp",
    48     'desc' => "{BasePlugin.process_exp}",
     48    'desc' => "{BaseImporter.process_exp}",
    4949    'type' => "regexp",
    5050    'reqd' => "no",
    5151    'deft' => &get_default_process_exp() },
    5252      { 'name' => "block_exp",
    53     'desc' => "{BasePlugin.block_exp}",
     53    'desc' => "{BaseImporter.block_exp}",
    5454    'type' => "regexp",
    5555    'reqd' => "no",
     
    7070    push(@{$hashArgOptLists->{"OptList"}},$options);
    7171
    72     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     72    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    7373
    7474    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/FavouritesPlugin.pm

    r21759 r31492  
    4040my $arguments =
    4141    [ { 'name' => "process_exp",
    42     'desc' => "{BasePlugin.process_exp}",
     42    'desc' => "{BaseImporter.process_exp}",
    4343    'type' => "regexp",
    4444    'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/GreenstoneMETSPlugin.pm

    r22840 r31492  
    4747
    4848my $arguments = [ { 'name' => "process_exp",
    49             'desc' => "{BasePlugin.process_exp}",
     49            'desc' => "{BaseImporter.process_exp}",
    5050            'type' => "regexp",
    5151            'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/GreenstoneXMLPlugin.pm

    r31480 r31492  
    5757my $arguments =
    5858    [ { 'name' => "process_exp",
    59     'desc' => "{BasePlugin.process_exp}",
     59    'desc' => "{BaseImporter.process_exp}",
    6060    'type' => "regexp",
    6161    'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/HBPlugin.pm

    r18327 r31492  
    4141
    4242use ghtml;
    43 use BasePlugin;
     43use BaseImporter;
    4444use unicode;
    4545use util;
     
    5050
    5151sub BEGIN {
    52     @HBPlugin::ISA = ('BasePlugin');
     52    @HBPlugin::ISA = ('BaseImporter');
    5353}
    5454my $encoding_list =     
    5555    [ { 'name' => "ascii",
    56     'desc' => "{BasePlugin.encoding.ascii}" },
     56    'desc' => "{BaseImporter.encoding.ascii}" },
    5757      { 'name' => "iso_8859_1",
    5858    'desc' => "{HBPlugin.encoding.iso_8859_1}" } ];
     
    6060my $arguments =
    6161    [ { 'name' => "process_exp",
    62     'desc' => "{BasePlugin.process_exp}",
     62    'desc' => "{BaseImporter.process_exp}",
    6363    'type' => "regexp",
    6464    'reqd' => "no",
     
    8686    push(@{$hashArgOptLists->{"OptList"}},$options);
    8787
    88     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     88    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    8989
    9090    return bless $self, $class;
     
    9292
    9393# this is included only to prevent warnings being printed out
    94 # from BasePlugin::init. The process_exp is not used by this plugin
     94# from BaseImporter::init. The process_exp is not used by this plugin
    9595sub get_default_process_exp {
    9696    my $self = shift (@_);
  • main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

    r31480 r31492  
    6262my $arguments =
    6363    [ { 'name' => "process_exp",
    64     'desc' => "{BasePlugin.process_exp}",
     64    'desc' => "{BaseImporter.process_exp}",
    6565    'type' => "regexp",
    6666    'deft' =>  &get_default_process_exp() },
    6767      { 'name' => "block_exp",
    68     'desc' => "{BasePlugin.block_exp}",
     68    'desc' => "{BaseImporter.block_exp}",
    6969    'type' => 'regexp',
    7070    'deft' =>  &get_default_block_exp() },
     
    127127    'type' => "flag"},
    128128      {'name' => "processing_tmp_files",
    129        'desc' => "{BasePlugin.processing_tmp_files}",
     129       'desc' => "{BaseImporter.processing_tmp_files}",
    130130       'type' => "flag",
    131131       'hiddengli' => "yes"}
     
    12841284        my $filename_encoding =  $self->guess_filesystem_encoding(); 
    12851285       
    1286         # copied this from set_Source_metadata in BasePlugin
     1286        # copied this from set_Source_metadata in BaseImporter
    12871287        if ((defined $filename_encoding) && ($filename_encoding ne "ascii")) {
    12881288        # Use filename_encoding to map raw filename to a Perl unicode-aware string
  • main/trunk/greenstone2/perllib/plugins/HathiTrustMETSPlugin.pm

    r31480 r31492  
    8282my $arguments =
    8383    [ { 'name' => "process_exp",
    84     'desc' => "{BasePlugin.process_exp}",
     84    'desc' => "{BaseImporter.process_exp}",
    8585    'type' => "string",
    8686    'deft' => &get_default_process_exp(),
     
    101101#   'reqd' => "no" },
    102102      {'name' => "processing_tmp_files",
    103        'desc' => "{BasePlugin.processing_tmp_files}",
     103       'desc' => "{BaseImporter.processing_tmp_files}",
    104104       'type' => "flag",
    105105       'hiddengli' => "yes"}
     
    141141    my $rxf_self = new ReadXMLFile($pluginlist, $inputargs, $hashArgOptLists);
    142142
    143     my $self = BasePlugin::merge_inheritance($imc_self,$rtf_self,$rxf_self);
     143    my $self = BaseImporter::merge_inheritance($imc_self,$rtf_self,$rxf_self);
    144144
    145145    # Update $self used by XML::Parser so it finds callback functions
     
    188188
    189189
    190 # want to use BasePlugin's version of this, not ReadXMLFile's
     190# want to use BaseImporter's version of this, not ReadXMLFile's
    191191sub can_process_this_file {
    192192    my $self = shift(@_);
    193     return $self->BasePlugin::can_process_this_file(@_);
     193    return $self->BaseImporter::can_process_this_file(@_);
    194194}
    195195
     
    213213}
    214214
    215 # we want to use BasePlugin's read, not ReadXMLFile's
     215# we want to use BaseImporter's read, not ReadXMLFile's
    216216sub read
    217217{
    218218    my $self = shift (@_);
    219219
    220     $self->BasePlugin::read(@_);
     220    $self->BaseImporter::read(@_);
    221221}
    222222
  • main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm

    r31480 r31492  
    4646my $arguments =
    4747    [ { 'name' => "process_exp",
    48     'desc' => "{BasePlugin.process_exp}",
     48    'desc' => "{BaseImporter.process_exp}",
    4949    'type' => "regexp",
    5050    'reqd' => "no",
    5151    'deft' => &get_default_process_exp() },
    5252      { 'name' => "block_exp",
    53     'desc' => "{BasePlugin.block_exp}",
     53    'desc' => "{BaseImporter.block_exp}",
    5454    'type' => "regexp",
    5555    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/ImageConverter.pm

    r27787 r31492  
    155155}
    156156
    157 # needs to be called after BasePlugin init, so that outhandle is set up.
     157# needs to be called after BaseImporter init, so that outhandle is set up.
    158158sub init {
    159159    my $self = shift(@_);
     
    318318    }
    319319
    320     #overwrite the ones added in BasePlugin
     320    #overwrite the ones added in BaseImporter
    321321    $doc_obj->set_metadata_element ($section, "FileFormat", $type);
    322322    my $sys_file_size = &FileUtils::fileSize($filename_full_path);
  • main/trunk/greenstone2/perllib/plugins/ImagePlugin.pm

    r27787 r31492  
    2626package ImagePlugin;
    2727
    28 use BasePlugin;
     28use BaseImporter;
    2929use ImageConverter;
    3030
     
    3636
    3737sub BEGIN {
    38     @ImagePlugin::ISA = ('BasePlugin', 'ImageConverter');
     38    @ImagePlugin::ISA = ('BaseImporter', 'ImageConverter');
    3939}
    4040
    4141my $arguments =
    4242    [ { 'name' => "process_exp",
    43     'desc' => "{BasePlugin.process_exp}",
     43    'desc' => "{BaseImporter.process_exp}",
    4444    'type' => "regexp",
    4545    'deft' => &get_default_process_exp(),
     
    6565   
    6666    new ImageConverter($pluginlist, $inputargs, $hashArgOptLists);
    67     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     67    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    6868
    6969    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/IndexPlugin.pm

    r16392 r31492  
    5353
    5454use plugin;
    55 use BasePlugin;
     55use BaseImporter;
    5656use doc;
    5757use util;
     
    6262
    6363sub BEGIN {
    64     @IndexPlugin::ISA = ('BasePlugin');
     64    @IndexPlugin::ISA = ('BaseImporter');
    6565}
    6666
     
    8181    push(@{$hashArgOptLists->{"OptList"}},$options);
    8282
    83     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     83    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    8484
    8585    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/LOMPlugin.pm

    r28560 r31492  
    5252my $arguments =
    5353    [ { 'name' => "process_exp",
    54     'desc' => "{BasePlugin.process_exp}",
     54    'desc' => "{BaseImporter.process_exp}",
    5555    'type' => "string",
    5656    'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/LaTeXPlugin.pm

    r24548 r31492  
    4040my $arguments =
    4141    [ { 'name' => "process_exp",
    42     'desc' => "{BasePlugin.process_exp}",
     42    'desc' => "{BaseImporter.process_exp}",
    4343    'type' => "regexp",
    4444    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/MARCPlugin.pm

    r29476 r31492  
    4242# precedence in the order given in the ISA list. We want MetaPlugins to
    4343# call MetadataRead's can_process_this_file_for_metadata(), rather than
    44 # calling BasePlugin's version of the same method, so list inherited
     44# calling BaseImporter's version of the same method, so list inherited
    4545# superclasses in this order.
    4646sub BEGIN {
     
    6262    'reqd' => "no" },
    6363      { 'name' => "process_exp",
    64     'desc' => "{BasePlugin.process_exp}",
     64    'desc' => "{BaseImporter.process_exp}",
    6565    'type' => "regexp",
    6666    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/MARCXMLPlugin.pm

    r28803 r31492  
    4949          'reqd' => "no" },
    5050         { 'name' => "process_exp",
    51            'desc' => "{BasePlugin.process_exp}",
     51           'desc' => "{BaseImporter.process_exp}",
    5252           'type' => "regexp",
    5353           'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/MP3Plugin.pm

    r24225 r31492  
    2828package MP3Plugin;
    2929
    30 use BasePlugin;
     30use BaseImporter;
    3131
    3232use strict;
     
    3939
    4040sub BEGIN {
    41     @MP3Plugin::ISA = ('BasePlugin');
     41    @MP3Plugin::ISA = ('BaseImporter');
    4242}
    4343
    4444my $arguments =
    4545    [ { 'name' => "process_exp",
    46     'desc' => "{BasePlugin.process_exp}",
     46    'desc' => "{BaseImporter.process_exp}",
    4747    'type' => "regexp",
    4848    'deft' => &get_default_process_exp(),
     
    6262    'deft' => "Title,Artist,Genre" },
    6363      { 'name' => "file_rename_method",
    64     'desc' => "{BasePlugin.file_rename_method}",
     64    'desc' => "{BaseImporter.file_rename_method}",
    6565    'type' => "enum",
    6666    'deft' => &get_default_file_rename_method(), # by default rename imported files and assoc files using this encoding
    67     'list' => $BasePlugin::file_rename_method_list,
     67    'list' => $BaseImporter::file_rename_method_list,
    6868    'reqd' => "no"
    6969      } ];
     
    8383    push(@{$hashArgOptLists->{"OptList"}},$options);
    8484
    85     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     85    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    8686
    8787    return bless $self, $class;
     
    120120    }
    121121   
    122     my $text = &gsprintf::lookup_string("{BasePlugin.dummy_text}",1);
     122    my $text = &gsprintf::lookup_string("{BaseImporter.dummy_text}",1);
    123123    if ($self->{'assoc_images'}) {
    124124    $text .= "[img1]<br>";
     
    338338
    339339
    340 # we want to use ex.id3.Title if its there, otherwise we'll use BasePlugin method
     340# we want to use ex.id3.Title if its there, otherwise we'll use BaseImporter method
    341341sub title_fallback
    342342{
     
    350350    }
    351351    else {
    352         $self->BasePlugin::title_fallback($doc_obj, $section, $file);
     352        $self->BaseImporter::title_fallback($doc_obj, $section, $file);
    353353    }
    354354    }
  • main/trunk/greenstone2/perllib/plugins/MediainfoOGVPlugin.pm

    r24546 r31492  
    5050package MediainfoOGVPlugin;
    5151
    52 use BasePlugin;
     52use BaseImporter;
    5353
    5454use strict;
     
    5757
    5858sub BEGIN {
    59     @MediainfoOGVPlugin::ISA = ('BasePlugin');
     59    @MediainfoOGVPlugin::ISA = ('BaseImporter');
    6060}
    6161
    6262my $arguments  = 
    6363    [ { 'name' => "process_exp",
    64         'desc' => "{BasePlugin.process_exp}",
     64        'desc' => "{BaseImporter.process_exp}",
    6565        'type' => "regexp",
    6666        'deft' => &get_default_process_exp(),
     
    8888    push(@{$hashArgOptLists->{"OptList"}},$options);
    8989
    90     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     90    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    9191
    9292    return bless $self, $class;
     
    9797    my ($verbosity, $outhandle, $failhandle) = @_;
    9898
    99     $self->BasePlugin::init($verbosity, $outhandle, $failhandle);   
     99    $self->BaseImporter::init($verbosity, $outhandle, $failhandle);   
    100100
    101101    # Check that Mediainfo is installed and available on the path (except for Windows 95/98)
  • main/trunk/greenstone2/perllib/plugins/MetadataCSVPlugin.pm

    r31480 r31492  
    2828
    2929
    30 use BasePlugin;
     30use BaseImporter;
    3131use MetadataRead;
    3232
     
    4242# methods with identical signatures take precedence in the order given in the ISA list.
    4343sub BEGIN {
    44     @MetadataCSVPlugin::ISA = ('MetadataRead', 'BasePlugin');
     44    @MetadataCSVPlugin::ISA = ('MetadataRead', 'BaseImporter');
    4545}
    4646
     
    4848my $arguments = [
    4949      { 'name' => "process_exp",
    50     'desc' => "{BasePlugin.process_exp}",
     50    'desc' => "{BaseImporter.process_exp}",
    5151    'type' => "regexp",
    5252    'reqd' => "no",
     
    7272    push(@{$hashArgOptLists->{"OptList"}},$options);
    7373
    74     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     74    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    7575
    7676    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/MetadataRead.pm

    r24547 r31492  
    3838
    3939# MetadataRead defines method can_process_this_file_for_metadata() with identical
    40 # signature to BasePlugin. (MetadataRead doesn't inherit from BasePlugin, so it's
     40# signature to BaseImporter. (MetadataRead doesn't inherit from BaseImporter, so it's
    4141# not 'overriding' it.) Subclasses of MetadataRead that want to use this method
    42 # definition can override their inherited BasePlugin version of the method by
     42# definition can override their inherited BaseImporter version of the method by
    4343# listing MetadataRead as the *first* superclass they inherit from in the ISA list.
    4444# This is the way Perl resolves conflicting method definitions.
  • main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm

    r31480 r31492  
    9292use Encode;
    9393
    94 use BasePlugin;
     94use BaseImporter;
    9595use extrametautil;
    9696use util;
     
    9999
    100100sub BEGIN {
    101     @MetadataXMLPlugin::ISA = ('BasePlugin');
     101    @MetadataXMLPlugin::ISA = ('BaseImporter');
    102102    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
    103103}
     
    107107my $arguments = [
    108108      { 'name' => "process_exp",
    109     'desc' => "{BasePlugin.process_exp}",
     109    'desc' => "{BaseImporter.process_exp}",
    110110    'type' => "regexp",
    111111    'reqd' => "no",
     
    128128    push(@{$hashArgOptLists->{"OptList"}},$options);
    129129
    130     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     130    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    131131
    132132    if ($self->{'info_only'}) {
  • main/trunk/greenstone2/perllib/plugins/NulPlugin.pm

    r24548 r31492  
    3737package NulPlugin;
    3838
    39 use BasePlugin;
     39use BaseImporter;
    4040use MetadataRead;
    4141
     
    4444
    4545sub BEGIN {
    46     @NulPlugin::ISA = ('MetadataRead', 'BasePlugin');
     46    @NulPlugin::ISA = ('MetadataRead', 'BaseImporter');
    4747}
    4848
    4949my $arguments =
    5050    [ { 'name' => "process_exp",
    51     'desc' => "{BasePlugin.process_exp}",
     51    'desc' => "{BaseImporter.process_exp}",
    5252    'type' => "regexp",
    5353    'reqd' => "no",
     
    8181    push(@{$hashArgOptLists->{"OptList"}},$options);
    8282
    83     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     83    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    8484   
    8585    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm

    r27283 r31492  
    5757my $arguments =
    5858    [ { 'name' => "process_exp",
    59     'desc' => "{BasePlugin.process_exp}",
     59    'desc' => "{BaseImporter.process_exp}",
    6060    'type' => "regexp",
    6161    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/OggVorbisPlugin.pm

    r24225 r31492  
    3030
    3131
    32 use BasePlugin;
     32use BaseImporter;
    3333use Ogg::Vorbis::Header::PurePerl;
    3434
     
    3838
    3939sub BEGIN {
    40     @OggVorbisPlugin::ISA = ('BasePlugin');
     40    @OggVorbisPlugin::ISA = ('BaseImporter');
    4141}
    4242
     
    4444my $arguments =
    4545    [ { 'name' => "process_exp",
    46     'desc' => "{BasePlugin.process_exp}",
     46    'desc' => "{BaseImporter.process_exp}",
    4747    'type' => "string",
    4848    'deft' => &get_default_process_exp(),
     
    5353    'deft' => "" },
    5454      { 'name' => "file_rename_method",
    55     'desc' => "{BasePlugin.file_rename_method}",
     55    'desc' => "{BaseImporter.file_rename_method}",
    5656    'type' => "enum",
    5757    'deft' => &get_default_file_rename_method(), # by default rename imported files and assoc files using this encoding
    58     'list' => $BasePlugin::file_rename_method_list,
     58    'list' => $BaseImporter::file_rename_method_list,
    5959    'reqd' => "no"
    6060      } ];
     
    8888    push(@{$hashArgOptLists->{"OptList"}},$options);
    8989   
    90     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     90    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    9191   
    9292    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/OpenDocumentPlugin.pm

    r28285 r31492  
    5656my $arguments = [
    5757         { 'name' => "process_exp",
    58            'desc' => "{BasePlugin.process_exp}",
     58           'desc' => "{BaseImporter.process_exp}",
    5959           'type' => "regexp",
    6060           'deft' =>  &get_default_process_exp() }
     
    8585}
    8686
    87 # want to use BasePlugin's version of this, not ReadXMLFile's
     87# want to use BaseImporter's version of this, not ReadXMLFile's
    8888sub can_process_this_file {
    8989    my $self = shift(@_);
    9090   
    91     return $self->BasePlugin::can_process_this_file(@_);
     91    return $self->BaseImporter::can_process_this_file(@_);
    9292}
    9393
  • main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm

    r30742 r31492  
    6262       'deft' => "html" },   
    6363     { 'name' => "process_exp",
    64        'desc' => "{BasePlugin.process_exp}",
     64       'desc' => "{BaseImporter.process_exp}",
    6565       'type' => "regexp",
    6666       'deft' => &get_default_process_exp(),
    6767       'reqd' => "no" },
    6868     { 'name' => "block_exp",
    69        'desc' => "{BasePlugin.block_exp}",
     69       'desc' => "{BaseImporter.block_exp}",
    7070       'type' => "regexp",
    7171       'deft' => &get_default_block_exp() },
     
    126126    my $auto_converter_self = new AutoLoadConverters($pluginlist,$inputargs,$hashArgOptLists,["PDFBoxConverter"],1);
    127127    my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
    128     my $self = BasePlugin::merge_inheritance($auto_converter_self, $cbf_self);
     128    my $self = BaseImporter::merge_inheritance($auto_converter_self, $cbf_self);
    129129   
    130130    if ($self->{'info_only'}) {
  • 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
  • main/trunk/greenstone2/perllib/plugins/PostScriptPlugin.pm

    r22874 r31492  
    5858    'deft' => "text" },
    5959      { 'name' => "process_exp",
    60     'desc' => "{BasePlugin.process_exp}",
     60    'desc' => "{BaseImporter.process_exp}",
    6161    'type' => "regexp",
    6262    'deft' => &get_default_process_exp(),
    6363    'reqd' => "no" },
    6464      { 'name' => "block_exp",
    65     'desc' => "{BasePlugin.block_exp}",
     65    'desc' => "{BaseImporter.block_exp}",
    6666    'type' => 'regexp',
    6767    'deft' => &get_default_block_exp() },
  • main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm

    r25192 r31492  
    7979my $arguments =
    8080    [ { 'name' => "process_exp",
    81     'desc' => "{BasePlugin.process_exp}",
     81    'desc' => "{BaseImporter.process_exp}",
    8282    'type' => "regexp",
    8383    'reqd' => "no",
     
    154154
    155155    my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
    156     my $self = BasePlugin::merge_inheritance($auto_converter_self, $cbf_self);
     156    my $self = BaseImporter::merge_inheritance($auto_converter_self, $cbf_self);
    157157
    158158    if ($self->{'info_only'}) {
     
    296296    # we are only doing something special for html_multi
    297297    if (!($self->{'openoffice_conversion'} && $self->{'convert_to'} eq "html_multi")) {
    298     return $self->BasePlugin::read(@_);
     298    return $self->BaseImporter::read(@_);
    299299    }
    300300    my $outhandle = $self->{'outhandle'};
  • main/trunk/greenstone2/perllib/plugins/ProCitePlugin.pm

    r24548 r31492  
    4343my $arguments =
    4444    [ { 'name' => "process_exp",
    45     'desc' => "{BasePlugin.process_exp}",
     45    'desc' => "{BaseImporter.process_exp}",
    4646    'type' => "regexp",
    4747    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/RTFPlugin.pm

    r22874 r31492  
    4848    'deft' => "html" },
    4949      { 'name' => "process_exp",
    50     'desc' => "{BasePlugin.process_exp}",
     50    'desc' => "{BaseImporter.process_exp}",
    5151    'type' => "regexp",
    5252    'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/ReadTextFile.pm

    r31458 r31492  
    4949    [ { 'name' => "auto",
    5050    'desc' => "{ReadTextFile.input_encoding.auto}" } ];
    51 push(@{$encoding_plus_auto_list},@{$EncodingUtil::encoding_list});
     51push(@{$encoding_plus_auto_list},@{$CommonUtil::encoding_list});
    5252
    5353my $arguments =
     
    6161    'desc' => "{ReadTextFile.default_encoding}",
    6262    'type' => "enum",
    63     'list' => $EncodingUtil::encoding_list,
     63    'list' => $CommonUtil::encoding_list,
    6464    'reqd' => "no",
    6565        'deft' => "utf8" },
  • main/trunk/greenstone2/perllib/plugins/ReadXMLFile.pm

    r28836 r31492  
    2626package ReadXMLFile;
    2727
    28 use BasePlugin;
     28use BaseImporter;
    2929use doc;
    3030use strict;
     
    3232
    3333sub BEGIN {
    34     @ReadXMLFile::ISA = ('BasePlugin');
     34    @ReadXMLFile::ISA = ('BaseImporter');
    3535    unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
    3636}
     
    4040my $arguments =
    4141    [ { 'name' => "process_exp",
    42     'desc' => "{BasePlugin.process_exp}",
     42    'desc' => "{BaseImporter.process_exp}",
    4343    'type' => "regexp",
    4444    'deft' => &get_default_process_exp(),
     
    6464    push(@{$hashArgOptLists->{"OptList"}},$options);
    6565   
    66     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     66    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    6767
    6868    if ($self->{'info_only'}) {
     
    385385    $self->set_Source_metadata($doc_obj, $filename_full_path, $filename_encoding);
    386386   
    387     # do we want other auto metadata here (see BasePlugin.read_into_doc_obj)
     387    # do we want other auto metadata here (see BaseImporter.read_into_doc_obj)
    388388}
    389389
     
    392392    my $doc_obj = $self->{'doc_obj'};
    393393
    394     # do we want other auto stuff here, see BasePlugin.read_into_doc_obj
     394    # do we want other auto stuff here, see BaseImporter.read_into_doc_obj
    395395
    396396    # include any metadata passed in from previous plugins
  • main/trunk/greenstone2/perllib/plugins/RealMediaPlugin.pm

    r24225 r31492  
    3030
    3131
    32 use BasePlugin;
     32use BaseImporter;
    3333use rm::Header::PurePerl;
    3434
     
    3838
    3939sub BEGIN {
    40     @RealMediaPlugin::ISA = ('BasePlugin');
     40    @RealMediaPlugin::ISA = ('BaseImporter');
    4141}
    4242
     
    4444my $arguments =
    4545    [ { 'name' => "process_exp",
    46     'desc' => "{BasePlugin.process_exp}",
     46    'desc' => "{BaseImporter.process_exp}",
    4747    'type' => "regexp",
    4848    'deft' => &get_default_process_exp(),
     
    7272    push(@{$hashArgOptLists->{"OptList"}}, $options);
    7373
    74     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     74    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    7575   
    7676    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/ReferPlugin.pm

    r24548 r31492  
    6868no strict 'refs'; # allow filehandles to be variables and viceversa
    6969
    70 # ReferPlugin is a sub-class of BasePlugin.
     70# ReferPlugin is a sub-class of BaseImporter.
    7171sub BEGIN {
    7272    @ReferPlugin::ISA = ('MetadataRead', 'SplitTextFile');
     
    7575my $arguments =
    7676    [ { 'name' => "process_exp",
    77     'desc' => "{BasePlugin.process_exp}",
     77    'desc' => "{BaseImporter.process_exp}",
    7878    'type' => "regexp",
    7979    'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/RogPlugin.pm

    r24548 r31492  
    2828package RogPlugin;
    2929
    30 use BasePlugin;
     30use BaseImporter;
    3131use MetadataRead;
    3232use sorttools;
     
    3737
    3838sub BEGIN {
    39     @RogPlugin::ISA = ('MetadataRead', 'BasePlugin');
     39    @RogPlugin::ISA = ('MetadataRead', 'BaseImporter');
    4040}
    4141
    4242my $arguments =
    4343    [ { 'name' => "process_exp",
    44     'desc' => "{BasePlugin.process_exp}",
     44    'desc' => "{BaseImporter.process_exp}",
    4545    'type' => "regexp",
    4646    'reqd' => "no",
     
    6262    push(@{$hashArgOptLists->{"OptList"}},$options);
    6363
    64     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     64    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    6565
    6666    return bless $self, $class;
  • main/trunk/greenstone2/perllib/plugins/SourceCodePlugin.pm

    r24548 r31492  
    4949my $arguments =
    5050    [ { 'name' => "process_exp",
    51     'desc' => "{BasePlugin.process_exp}",
     51    'desc' => "{BaseImporter.process_exp}",
    5252    'type' => "regexp",
    5353    'deft' => &get_default_process_exp(),
    5454    'reqd' => "no" } ,
    5555      { 'name' => "block_exp",
    56     'desc' => "{BasePlugin.block_exp}",
     56    'desc' => "{BaseImporter.block_exp}",
    5757    'type' => "regexp",
    5858    'deft' => &get_default_block_exp(),
  • main/trunk/greenstone2/perllib/plugins/TabSeparatedPlugin.pm

    r28782 r31492  
    4444my $arguments =
    4545    [ { 'name' => "process_exp",
    46     'desc' => "{BasePlugin.process_exp}",
     46    'desc' => "{BaseImporter.process_exp}",
    4747    'type' => "regexp",
    4848    'reqd' => "no",
  • main/trunk/greenstone2/perllib/plugins/TextPlugin.pm

    r30857 r31492  
    4141my $arguments =
    4242    [ { 'name' => "process_exp",
    43     'desc' => "{BasePlugin.process_exp}",
     43    'desc' => "{BaseImporter.process_exp}",
    4444    'type' => "regexp",
    4545    'deft' => &get_default_process_exp(),
  • main/trunk/greenstone2/perllib/plugins/UnknownPlugin.pm

    r24225 r31492  
    5656package UnknownPlugin;
    5757
    58 use BasePlugin;
     58use BaseImporter;
    5959
    6060use strict;
     
    6262
    6363sub BEGIN {
    64     @UnknownPlugin::ISA = ('BasePlugin');
     64    @UnknownPlugin::ISA = ('BaseImporter');
    6565}
    6666
     
    107107    push(@{$hashArgOptLists->{"OptList"}},$options);
    108108
    109     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     109    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    110110
    111111    # "-process_extension" is a simpler alternative to -process_exp for non-regexp people
  • main/trunk/greenstone2/perllib/plugins/WordPlugin.pm

    r28563 r31492  
    4242my $arguments =
    4343    [ { 'name' => "process_exp",
    44     'desc' => "{BasePlugin.process_exp}",
     44    'desc' => "{BaseImporter.process_exp}",
    4545    'type' => "regexp",
    4646    'deft' => "&get_default_process_exp()", # delayed (see below)
     
    142142
    143143    my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
    144     my $self = BasePlugin::merge_inheritance($auto_converter_self, $cbf_self);
     144    my $self = BaseImporter::merge_inheritance($auto_converter_self, $cbf_self);
    145145
    146146    if ($self->{'info_only'}) {
  • main/trunk/greenstone2/perllib/plugins/ZIPPlugin.pm

    r27927 r31492  
    4646package ZIPPlugin;
    4747
    48 use BasePlugin;
     48use BaseImporter;
    4949use plugin;
    5050use util;
     
    5656
    5757BEGIN {
    58     @ZIPPlugin::ISA = ('BasePlugin');
     58    @ZIPPlugin::ISA = ('BaseImporter');
    5959}
    6060
    6161my $arguments =
    6262    [ { 'name' => "process_exp",
    63     'desc' => "{BasePlugin.process_exp}",
     63    'desc' => "{BaseImporter.process_exp}",
    6464    'type' => "string",
    6565    'deft' => &get_default_process_exp(),
     
    8181    push(@{$hashArgOptLists->{"OptList"}},$options);
    8282
    83     my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
     83    my $self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
    8484
    8585    return bless $self, $class;
Note: See TracChangeset for help on using the changeset viewer.