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

gsdl/trunk/perllib/plugins/GMLPlugin.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# GMLPlug.pm --
+# GMLPlugin.pm --
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the 
@@ -29 +29 @@
 # 12/05/02 Added usage datastructure - John Thompson
 
-package GMLPlug;
-
-use BasPlug;
+package GMLPlugin;
+
+use BasePlugin;
 use util;
 use doc;
@@ -39 +39 @@
 
 sub BEGIN {
-    @GMLPlug::ISA = ('BasPlug');
+    @GMLPlugin::ISA = ('BasePlugin');
 }
 
 my $arguments =
     [ { 'name' => "process_exp",
-    'desc' => "{BasPlug.process_exp}",
+    'desc' => "{BasePlugin.process_exp}",
     'type' => "regexp",
     'deft' =>  &get_default_process_exp() } 
     ];
 
-my $options = { 'name'     => "GMLPlug",
-        'desc'     => "{GMLPlug.desc}",
+my $options = { 'name'     => "GMLPlugin",
+        'desc'     => "{GMLPlugin.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -60 +60 @@
     push(@$pluginlist, $class);
 
-    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
-    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
-
-    my $self = new BasPlug($pluginlist, $inputargs, $hashArgOptLists);
+    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
+    push(@{$hashArgOptLists->{"OptList"}},$options);
+
+    my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
 
     return bless $self, $class;
@@ -88 +88 @@
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
 
-    print STDERR "<Processing n='$file' p='GMLPlug'>\n" if ($gli);
-    print $outhandle "GMLPlug: processing $file\n";
+    print STDERR "<Processing n='$file' p='GMLPlugin'>\n" if ($gli);
+    print $outhandle "GMLPlugin: processing $file\n";
 
     my $parent_dir = $file;
@@ -99 +99 @@
         print STDERR "<ProcessingError n='$file' r='Could not read $filename'>\n";
     }
-    print $outhandle "GMLPlug::read - couldn't read $filename\n";
+    print $outhandle "GMLPlugin::read - couldn't read $filename\n";
     return -1;
     }
@@ -130 +130 @@
         if ($gml =~ /^\s*([^>]*)>(.*)$/so) {
             $tags = $1 if defined $1;
-            $text = &GMLPlug::_unescape_text($2);
+            $text = &GMLPlugin::_unescape_text($2);
 
         } else {
-            print $outhandle "GMLPlug::read - error in file $filename\n";
+            print $outhandle "GMLPlugin::read - error in file $filename\n";
             print $outhandle "text: \"$gml\"\n";
             last;
@@ -158 +158 @@
         # could be stored as either attributes or ....
         while ((defined $tags) && ($tags =~ s/^\s*(\S+)=\"([^\"]*)\"//o)) {
-            $doc_obj->add_utf8_metadata($section, $1, &GMLPlug::_unescape_text($2)) 
+            $doc_obj->add_utf8_metadata($section, $1, &GMLPlugin::_unescape_text($2)) 
             if (defined $1 and defined $2);
 
@@ -183 +183 @@
                 $tagname =~ s/^&\#47;/\//;
                 
-                $doc_obj->add_utf8_metadata($section, $tagname, &GMLPlug::_unescape_text($tagvalue)); 
+                $doc_obj->add_utf8_metadata($section, $tagname, &GMLPlugin::_unescape_text($tagvalue)); 
             }
             }