Show
Ignore:
Timestamp:
13.03.2017 12:06:26 (3 years ago)
Author:
kjdon
Message:

updated text string keys based on new plugin names

Location:
main/trunk/greenstone2/perllib/plugins
Files:
12 modified

Legend:

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

    r31492 r31494  
    6767    'deft' => &get_default_process_exp() }, 
    6868      { 'name' => "block_exp", 
    69     'desc' => "{BaseImporter.block_exp}", 
     69    'desc' => "{CommonUtil.block_exp}", 
    7070    'type' => "regexp", 
    7171    'reqd' => "no", 
  • main/trunk/greenstone2/perllib/plugins/CONTENTdmPlugin.pm

    r31492 r31494  
    7676    'reqd' => "no" }, 
    7777      { 'name' => "block_exp", 
    78     'desc' => "{BaseImporter.block_exp}", 
     78    'desc' => "{CommonUtil.block_exp}", 
    7979    'type' => "regexp", 
    8080    'deft' => &get_default_block_exp() } 
  • main/trunk/greenstone2/perllib/plugins/CommonUtil.pm

    r31492 r31494  
    4444our $encoding_list = 
    4545    [ { 'name' => "ascii", 
    46     'desc' => "{BaseImporter.encoding.ascii}" }, 
     46    'desc' => "{CommonUtil.encoding.ascii}" }, 
    4747      { 'name' => "utf8", 
    48     'desc' => "{BaseImporter.encoding.utf8}" }, 
     48    'desc' => "{CommonUtil.encoding.utf8}" }, 
    4949      { 'name' => "unicode", 
    50     'desc' => "{BaseImporter.encoding.unicode}" } ]; 
     50    'desc' => "{CommonUtil.encoding.unicode}" } ]; 
    5151 
    5252 
     
    6363our $encoding_plus_auto_list =  
    6464    [ { 'name' => "auto", 
    65     'desc' => "{BaseImporter.filename_encoding.auto}" }, 
     65    'desc' => "{CommonUtil.filename_encoding.auto}" }, 
    6666      { 'name' => "auto-language-analysis", 
    67     'desc' => "{BaseImporter.filename_encoding.auto_language_analysis}" }, # textcat 
     67    'desc' => "{CommonUtil.filename_encoding.auto_language_analysis}" }, # textcat 
    6868      { 'name' => "auto-filesystem-encoding", 
    69     'desc' => "{BaseImporter.filename_encoding.auto_filesystem_encoding}" }, # locale 
     69    'desc' => "{CommonUtil.filename_encoding.auto_filesystem_encoding}" }, # locale 
    7070      { 'name' => "auto-fl", 
    71     'desc' => "{BaseImporter.filename_encoding.auto_fl}" }, # locale followed by textcat 
     71    'desc' => "{CommonUtil.filename_encoding.auto_fl}" }, # locale followed by textcat 
    7272      { 'name' => "auto-lf", 
    73     'desc' => "{BaseImporter.filename_encoding.auto_lf}" } ]; # texcat followed by locale  
     73    'desc' => "{CommonUtil.filename_encoding.auto_lf}" } ]; # texcat followed by locale  
    7474 
    7575push(@{$encoding_plus_auto_list},@{$encoding_list}); 
     
    7777my $arguments = 
    7878    [  { 'name' => "block_exp", 
    79      'desc' => "{BaseImporter.block_exp}", 
     79     'desc' => "{CommonUtil.block_exp}", 
    8080     'type' => "regexp", 
    8181     'deft' => "", 
    8282     'reqd' => "no" }, 
    8383       { 'name' => "no_blocking", 
    84      'desc' => "{BaseImporter.no_blocking}", 
     84     'desc' => "{CommonUtil.no_blocking}", 
    8585     'type' => "flag", 
    8686     'reqd' => "no"}, 
    8787       { 'name' => "filename_encoding", 
    88      'desc' => "{BaseImporter.filename_encoding}", 
     88     'desc' => "{CommonUtil.filename_encoding}", 
    8989     'type' => "enum", 
    9090     'deft' => "auto", 
     
    267267    my $outhandle = $self->{'outhandle'}; 
    268268 
    269     print $outhandle "****!!!!**** BaseImporter::filename_to_utf8_metadata now deprecated\n"; 
     269    print $outhandle "****!!!!**** CommonUtil::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, "BaseImporter: {ReadTextFile.unsupported_encoding}\n", $text, $best_encoding, "undef"); 
     365        gsprintf($outhandle, "CommonUtil: {ReadTextFile.unsupported_encoding}\n", $text, $best_encoding, "undef"); 
    366366    } 
    367367    $best_encoding = undef; 
  • main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm

    r31492 r31494  
    7979    'reqd' => "no" }, 
    8080      { 'name' => "block_exp", 
    81     'desc' => "{BaseImporter.block_exp}", 
     81    'desc' => "{CommonUtil.block_exp}", 
    8282    'type' => "regexp", 
    8383    'deft' => &get_default_block_exp(), 
  • main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm

    r31492 r31494  
    5252my $arguments = 
    5353    [ { 'name' => "block_exp", 
    54     'desc' => "{BaseImporter.block_exp}", 
     54    'desc' => "{CommonUtil.block_exp}", 
    5555    'type' => "regexp", 
    5656    'deft' => &get_default_block_exp(), 
  • main/trunk/greenstone2/perllib/plugins/FOXPlugin.pm

    r31492 r31494  
    5151    'deft' => &get_default_process_exp() }, 
    5252      { 'name' => "block_exp", 
    53     'desc' => "{BaseImporter.block_exp}", 
     53    'desc' => "{CommonUtil.block_exp}", 
    5454    'type' => "regexp", 
    5555    'reqd' => "no", 
  • main/trunk/greenstone2/perllib/plugins/HBPlugin.pm

    r31492 r31494  
    5454my $encoding_list =      
    5555    [ { 'name' => "ascii", 
    56     'desc' => "{BaseImporter.encoding.ascii}" }, 
     56    'desc' => "{CommonUtil.encoding.ascii}" }, 
    5757      { 'name' => "iso_8859_1", 
    5858    'desc' => "{HBPlugin.encoding.iso_8859_1}" } ]; 
  • main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

    r31492 r31494  
    6666    'deft' =>  &get_default_process_exp() }, 
    6767      { 'name' => "block_exp", 
    68     'desc' => "{BaseImporter.block_exp}", 
     68    'desc' => "{CommonUtil.block_exp}", 
    6969    'type' => 'regexp', 
    7070    'deft' =>  &get_default_block_exp() }, 
  • main/trunk/greenstone2/perllib/plugins/ISISPlugin.pm

    r31492 r31494  
    5151    'deft' => &get_default_process_exp() }, 
    5252      { 'name' => "block_exp", 
    53     'desc' => "{BaseImporter.block_exp}", 
     53    'desc' => "{CommonUtil.block_exp}", 
    5454    'type' => "regexp", 
    5555    'reqd' => "no", 
  • main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm

    r31492 r31494  
    6767       'reqd' => "no" }, 
    6868     { 'name' => "block_exp", 
    69        'desc' => "{BaseImporter.block_exp}", 
     69       'desc' => "{CommonUtil.block_exp}", 
    7070       'type' => "regexp", 
    7171       'deft' => &get_default_block_exp() }, 
  • main/trunk/greenstone2/perllib/plugins/PostScriptPlugin.pm

    r31492 r31494  
    6363    'reqd' => "no" }, 
    6464      { 'name' => "block_exp", 
    65     'desc' => "{BaseImporter.block_exp}", 
     65    'desc' => "{CommonUtil.block_exp}", 
    6666    'type' => 'regexp', 
    6767    'deft' => &get_default_block_exp() }, 
  • main/trunk/greenstone2/perllib/plugins/SourceCodePlugin.pm

    r31492 r31494  
    5454    'reqd' => "no" } , 
    5555      { 'name' => "block_exp", 
    56     'desc' => "{BaseImporter.block_exp}", 
     56    'desc' => "{CommonUtil.block_exp}", 
    5757    'type' => "regexp", 
    5858    'deft' => &get_default_block_exp(),