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

gsdl/trunk/perllib/plugins/OAIPlugin.pm

@@ -25 +25 @@
 ###########################################################################
 
-package OAIPlug;
-
-use BasPlug;
+package OAIPlugin;
+
 use unicode;
 use util;
@@ -34 +33 @@
 no strict 'refs'; # allow filehandles to be variables and viceversa
 
-use XMLPlug;
+use ReadXMLFile;
 
 sub BEGIN {
-    @OAIPlug::ISA = ('XMLPlug');
+    @OAIPlugin::ISA = ('ReadXMLFile');
 }
 
@@ -49 +48 @@
       ];
 
-my $options = { 'name'     => "OAIPlug",
-        'desc'     => "{OAIPlug.desc}",
+my $options = { 'name'     => "OAIPlugin",
+        'desc'     => "{OAIPlugin.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -61 +60 @@
     push(@$pluginlist, $class);
 
-    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
-    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
-
-    my $self = new XMLPlug($pluginlist, $inputargs, $hashArgOptLists);
+    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
+    push(@{$hashArgOptLists->{"OptList"}},$options);
+
+    my $self = new ReadXMLFile($pluginlist, $inputargs, $hashArgOptLists);
 
     return bless $self, $class;
@@ -98 +97 @@
 
     my $outhandle = $self->{'outhandle'};
-    print $outhandle "OAIPlug: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
-    print STDERR "<Processing n='$self->{'file'}' p='OAIPlug'>\n" if $self->{'gli'};
+    print $outhandle "OAIPlugin: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
+    print STDERR "<Processing n='$self->{'file'}' p='OAIPlugin'>\n" if $self->{'gli'};
 
 }
@@ -199 +198 @@
     if ($srcdoc_exists)
     {
-        print $outhandle "OAIPlug: passing metadata on to $url_array->[0]\n"
+        print $outhandle "OAIPlugin: passing metadata on to $url_array->[0]\n"
         if ($self->{'verbosity'}>1);
         
@@ -265 +264 @@
     my $outhandle = $self->{'outhandle'};
 
-    print STDERR "<Processing n='$file' p='OAIPlug'>\n" if ($gli);
-    print $outhandle "OAIPlug: processing $file\n"
+    print STDERR "<Processing n='$file' p='OAIPlugin'>\n" if ($gli);
+    print $outhandle "OAIPlugin: processing $file\n"
     if $self->{'verbosity'} > 1;
 
@@ -411 +410 @@
 
     if ($top_level_prefix !~ /dc$/) {
-        print $outhandle "Warning: OAIPlug currently only designed for Dublin Core (or variant) metadata\n";
+        print $outhandle "Warning: OAIPlugin currently only designed for Dublin Core (or variant) metadata\n";
         print $outhandle "         This recorded metadata section '$top_level_prefix' does not appear to match.\n";
         print $outhandle "         Metadata assumed to be in form: <prefix:tag>value</prefix:tag> and will be converted\n";