Changeset 15872 for gsdl/trunk/perllib/plugins/ISISPlugin.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/ISISPlugin.pm (modified) (10 diffs)

gsdl/trunk/perllib/plugins/ISISPlugin.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# ISISPlug.pm -- A plugin for CDS/ISIS databases
+# ISISPlugin.pm -- A plugin for CDS/ISIS databases
 #
 # A component of the Greenstone digital library software
@@ -25 +25 @@
 ###########################################################################
 
-package ISISPlug;
+package ISISPlugin;
 
 
 use multiread;
-use SplitPlug;
+use SplitTextFile;
 
 use strict;
 no strict 'refs'; # allow filehandles to be variables and viceversa
 
-# ISISPlug is a sub-class of SplitPlug.
+# ISISPlugin is a sub-class of SplitTextFile.
 sub BEGIN {
-    @ISISPlug::ISA = ('SplitPlug');
+    @ISISPlugin::ISA = ('SplitTextFile');
 }
 
@@ -42 +42 @@
 my $arguments = 
     [ { 'name' => "process_exp",
-    'desc' => "{BasPlug.process_exp}",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
     'reqd' => "no",
     'deft' => &get_default_process_exp() },
       { 'name' => "block_exp",
-    'desc' => "{BasPlug.block_exp}",
+    'desc' => "{BasePlugin.block_exp}",
     'type' => "regexp",
     'reqd' => "no",
@@ -53 +53 @@
     'hiddengli' => "yes" },
       { 'name' => "split_exp",
-    'desc' => "{SplitPlug.split_exp}",
+    'desc' => "{SplitTextFile.split_exp}",
     'type' => "regexp",
     'reqd' => "no",
@@ -61 +61 @@
       # The interesting options
       { 'name' => "entry_separator",
-    'desc' => "{ISISPlug.entry_separator}",
+    'desc' => "{ISISPlugin.entry_separator}",
     'type' => "string",
     'reqd' => "no",
     'deft' => "<br>" },
       { 'name' => "subfield_separator",
-    'desc' => "{ISISPlug.subfield_separator}",
+    'desc' => "{ISISPlugin.subfield_separator}",
     'type' => "string",
     'reqd' => "no",
@@ -72 +72 @@
       ];
 
-my $options = { 'name'     => "ISISPlug",
-        'desc'     => "{ISISPlug.desc}",
+my $options = { 'name'     => "ISISPlugin",
+        'desc'     => "{ISISPlugin.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -104 +104 @@
     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);
 
     if ($self->{'info_only'}) {
@@ -157 +157 @@
 
     my $reader = new multiread();
-    $reader->set_handle('ISISPlug::FILE');
+    $reader->set_handle('ISISPlugin::FILE');
     $reader->set_encoding($encoding);
     $reader->read_file($textref);
@@ -186 +186 @@
 
     # Report that we're processing the file
-    print STDERR "\n<Processing n='$file' p='ISISPlug'>\n" if ($gli);
+    print STDERR "\n<Processing n='$file' p='ISISPlugin'>\n" if ($gli);
     print $outhandle "IsisPlug: processing $file\n" if ($self->{'verbosity'}) > 1;
 
@@ -348 +348 @@
     my $fdtfiletext = "";
     my $reader = new multiread();
-    $reader->set_handle('ISISPlug::FDT_FILE');
+    $reader->set_handle('ISISPlugin::FDT_FILE');
     $reader->set_encoding($encoding);
     $reader->read_file($fdtfiletext);