Changeset 31494 for main

Timestamp:

2017-03-13T12:06:26+13:00 (7 years ago)

Author:

kjdon

Message:

updated text string keys based on new plugin names

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BookPlugin.pm (modified) (1 diff)
• CONTENTdmPlugin.pm (modified) (1 diff)
• CommonUtil.pm (modified) (5 diffs)
• DSpacePlugin.pm (modified) (1 diff)
• DirectoryPlugin.pm (modified) (1 diff)
• FOXPlugin.pm (modified) (1 diff)
• HBPlugin.pm (modified) (1 diff)
• HTMLPlugin.pm (modified) (1 diff)
• ISISPlugin.pm (modified) (1 diff)
• PDFPlugin.pm (modified) (1 diff)
• PostScriptPlugin.pm (modified) (1 diff)
• SourceCodePlugin.pm (modified) (1 diff)

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

@@ -67 +67 @@
     'deft' => &get_default_process_exp() },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'reqd' => "no",

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

@@ -76 +76 @@
     'reqd' => "no" },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'deft' => &get_default_block_exp() }

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

@@ -44 +44 @@
 our $encoding_list =
     [ { 'name' => "ascii",
-    'desc' => "{BaseImporter.encoding.ascii}" },
+    'desc' => "{CommonUtil.encoding.ascii}" },
       { 'name' => "utf8",
-    'desc' => "{BaseImporter.encoding.utf8}" },
+    'desc' => "{CommonUtil.encoding.utf8}" },
       { 'name' => "unicode",
-    'desc' => "{BaseImporter.encoding.unicode}" } ];
+    'desc' => "{CommonUtil.encoding.unicode}" } ];
 
 
@@ -63 +63 @@
 our $encoding_plus_auto_list = 
     [ { 'name' => "auto",
-    'desc' => "{BaseImporter.filename_encoding.auto}" },
+    'desc' => "{CommonUtil.filename_encoding.auto}" },
       { 'name' => "auto-language-analysis",
-    'desc' => "{BaseImporter.filename_encoding.auto_language_analysis}" }, # textcat
+    'desc' => "{CommonUtil.filename_encoding.auto_language_analysis}" }, # textcat
       { 'name' => "auto-filesystem-encoding",
-    'desc' => "{BaseImporter.filename_encoding.auto_filesystem_encoding}" }, # locale
+    'desc' => "{CommonUtil.filename_encoding.auto_filesystem_encoding}" }, # locale
       { 'name' => "auto-fl",
-    'desc' => "{BaseImporter.filename_encoding.auto_fl}" }, # locale followed by textcat
+    'desc' => "{CommonUtil.filename_encoding.auto_fl}" }, # locale followed by textcat
       { 'name' => "auto-lf",
-    'desc' => "{BaseImporter.filename_encoding.auto_lf}" } ]; # texcat followed by locale 
+    'desc' => "{CommonUtil.filename_encoding.auto_lf}" } ]; # texcat followed by locale 
 
 push(@{$encoding_plus_auto_list},@{$encoding_list});
@@ -77 +77 @@
 my $arguments =
     [  { 'name' => "block_exp",
-     'desc' => "{BaseImporter.block_exp}",
+     'desc' => "{CommonUtil.block_exp}",
      'type' => "regexp",
      'deft' => "",
      'reqd' => "no" },
        { 'name' => "no_blocking",
-     'desc' => "{BaseImporter.no_blocking}",
+     'desc' => "{CommonUtil.no_blocking}",
      'type' => "flag",
      'reqd' => "no"},
        { 'name' => "filename_encoding",
-     'desc' => "{BaseImporter.filename_encoding}",
+     'desc' => "{CommonUtil.filename_encoding}",
      'type' => "enum",
      'deft' => "auto",
@@ -267 +267 @@
     my $outhandle = $self->{'outhandle'};
 
-    print $outhandle "****!!!!**** BaseImporter::filename_to_utf8_metadata now deprecated\n";
+    print $outhandle "****!!!!**** CommonUtil::filename_to_utf8_metadata now deprecated\n";
     my ($cpackage,$cfilename,$cline,$csubr,$chas_args,$cwantarray) = caller(0);
     print $outhandle "Calling method: $cfilename:$cline $cpackage->$csubr\n";
@@ -363 +363 @@
     {
     if ($self->{'verbosity'}) { 
-        gsprintf($outhandle, "BaseImporter: {ReadTextFile.unsupported_encoding}\n", $text, $best_encoding, "undef");
+        gsprintf($outhandle, "CommonUtil: {ReadTextFile.unsupported_encoding}\n", $text, $best_encoding, "undef");
     }
     $best_encoding = undef;

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

@@ -79 +79 @@
     'reqd' => "no" },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'deft' => &get_default_block_exp(),

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

@@ -52 +52 @@
 my $arguments =
     [ { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'deft' => &get_default_block_exp(),

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

@@ -51 +51 @@
     'deft' => &get_default_process_exp() },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'reqd' => "no",

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

@@ -54 +54 @@
 my $encoding_list =     
     [ { 'name' => "ascii",
-    'desc' => "{BaseImporter.encoding.ascii}" },
+    'desc' => "{CommonUtil.encoding.ascii}" },
       { 'name' => "iso_8859_1",
     'desc' => "{HBPlugin.encoding.iso_8859_1}" } ];

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

@@ -66 +66 @@
     'deft' =>  &get_default_process_exp() },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => 'regexp',
     'deft' =>  &get_default_block_exp() },

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

@@ -51 +51 @@
     'deft' => &get_default_process_exp() },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'reqd' => "no",

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

@@ -67 +67 @@
        'reqd' => "no" },
      { 'name' => "block_exp",
-       'desc' => "{BaseImporter.block_exp}",
+       'desc' => "{CommonUtil.block_exp}",
        'type' => "regexp",
        'deft' => &get_default_block_exp() },

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

@@ -63 +63 @@
     'reqd' => "no" },
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => 'regexp',
     'deft' => &get_default_block_exp() },

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

@@ -54 +54 @@
     'reqd' => "no" } ,
       { 'name' => "block_exp",
-    'desc' => "{BaseImporter.block_exp}",
+    'desc' => "{CommonUtil.block_exp}",
     'type' => "regexp",
     'deft' => &get_default_block_exp(),