Changeset 15872 for gsdl/trunk/perllib/plugins/MARCPlugin.pm

Timestamp:

2008-06-05T09:29:32+12:00 (16 years ago)

Author:

kjdon

Message:

plugin overhaul: plugins renamed to xxPlugin, and in some cases the names are made more sensible. They now use the new base plugins. Hopefully we have better code reuse. Some of the plugins still need work done as I didn't want to spend another month doing this before committing it. Alos, I haven't really tested anything yet...

File:

• gsdl/trunk/perllib/plugins/MARCPlugin.pm (modified) (11 diffs)

gsdl/trunk/perllib/plugins/MARCPlugin.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# MARCPlug.pm -- basic MARC plugin
+# MARCPlugin.pm -- basic MARC plugin
 #
 # A component of the Greenstone digital library software
@@ -25 +25 @@
 ###########################################################################
 
-package MARCPlug;
-
-use SplitPlug;
+package MARCPlugin;
+
+use SplitTextFile;
 
 use unicode;
@@ -36 +36 @@
 
 sub BEGIN {
-    @MARCPlug::ISA = ('SplitPlug');
+    @MARCPlugin::ISA = ('SplitTextFile');
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib/cpan");
 }
@@ -42 +42 @@
 my $arguments = 
     [ { 'name' => "metadata_mapping",
-    'desc' => "{MARCPlug.metadata_mapping}",
+    'desc' => "{MARCPlugin.metadata_mapping}",
     'type' => "string",
     'deft' => "marctodc.txt",
@@ -53 +53 @@
     'reqd' => "no" },
       { 'name' => "process_exp",
-    'desc' => "{BasPlug.process_exp}",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
     'reqd' => "no",
     'deft' => &get_default_process_exp() },
       { 'name' => "split_exp",
-    'desc' => "{SplitPlug.split_exp}",
+    'desc' => "{SplitTextFile.split_exp}",
     'type' => "regexp",
     'reqd' => "no",
@@ -64 +64 @@
       ];
 
-my $options = { 'name'     => "MARCPlug",
-        'desc'     => "{MARCPlug.desc}",
+my $options = { 'name'     => "MARCPlugin",
+        'desc'     => "{MARCPlugin.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -81 +81 @@
     push(@$pluginlist, $class);
 
-    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
-    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
-
-    my $self = new SplitPlug($pluginlist, $inputargs, $hashArgOptLists);
+    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
+    push(@{$hashArgOptLists->{"OptList"}},$options);
+
+    my $self = new SplitTextFile($pluginlist, $inputargs, $hashArgOptLists);
 
     # 'metadata_mapping' was used in two ways in the plugin: as a plugin
@@ -119 +119 @@
     {
 
-    my $msg = "MARCPlug ERROR: Can't locate mapping file \"" .
+    my $msg = "MARCPlugin ERROR: Can't locate mapping file \"" .
         $self->{'metadata_mapping_file'} . "\".\n" .
         "    No marc files can be processed.\n";
@@ -245 +245 @@
         push(@marc_entries,$marc);
     $$textref .= $marc->as_formatted();
-    $$textref .= "\n\n"; # for SplitPlug - see default_split_exp above...
+    $$textref .= "\n\n"; # for SplitTextFile - see default_split_exp above...
     }
 
@@ -254 +254 @@
 
 # do plugin specific processing of doc_obj
-# This gets done for each record found by SplitPlug in marc files.
+# This gets done for each record found by SplitTextFile in marc files.
 sub process {
     my $self = shift (@_);
@@ -264 +264 @@
     if (! defined($self->{'metadata_mapping'}))
     {
-    print $outhandle "MARCPlug: no metadata file! Can't process $file\n";
+    print $outhandle "MARCPlugin: no metadata file! Can't process $file\n";
     return undef;
     }
 
-    print STDERR "<Processing n='$file' p='MARCPlug'>\n" if ($gli);
-    print $outhandle "MARCPlug: processing $file\n"
+    print STDERR "<Processing n='$file' p='MARCPlugin'>\n" if ($gli);
+    print $outhandle "MARCPlugin: processing $file\n"
     if $self->{'verbosity'} > 1;