Changeset 21905 for main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm

Timestamp:

2010-04-19T14:05:50+12:00 (14 years ago)

Author:

mdewsnip

Message:

Changes made by Jeffrey Ke at DL Consulting Ltd to remove the global $self variable, so more than one variant of MetadataXMLPlugin (e.g. if you subclass MetadataXMLPlugin.pm) can be included in a collection without everything going pear-shaped.

File:

• main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm (modified) (8 diffs)

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

@@ -115 +115 @@
         'args'     => $arguments };
 
-my ($self);
-
 sub new {
     my ($class) = shift (@_);
@@ -125 +123 @@
     push(@{$hashArgOptLists->{"OptList"}},$options);
 
-    $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
+    my $self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
 
     if ($self->{'info_only'}) {
@@ -137 +135 @@
     # Perl 5.6
     $parser = new XML::Parser('Style' => 'Stream',
+                                  'PluginObj' => $self,
                   'Handlers' => {'Char' => \&Char,
                          'Doctype' => \&Doctype
@@ -144 +143 @@
     # Perl 5.8
     $parser = new XML::Parser('Style' => 'Stream',
+                                  'PluginObj' => $self,
                   'ProtocolEncoding' => 'ISO-8859-1',
                   'Handlers' => {'Char' => \&Char,
@@ -220 +220 @@
 }
 
-sub Doctype {
+
+# Updated by Jeffrey 2010/04/16 @ DL Consulting Ltd.
+# Get rid off the global $self as it cause problems when there are 2+ MetadataXMLPlugin in your collect.cfg...
+# For example when you have an OAIMetadataXMLPlugin that is a child of MetadataXMLPlugin
+sub Doctype {$_[0]->{'PluginObj'}->xml_doctype(@_);}
+sub StartTag {$_[0]->{'PluginObj'}->xml_start_tag(@_);}
+sub EndTag {$_[0]->{'PluginObj'}->xml_end_tag(@_);}
+sub Text {$_[0]->{'PluginObj'}->xml_text(@_);}
+
+
+sub xml_doctype {
+    my $self = shift(@_);
     my ($expat, $name, $sysid, $pubid, $internal) = @_;
 
@@ -229 +240 @@
 }
 
-sub StartTag {
+sub xml_start_tag {
+    my $self = shift(@_);
     my ($expat, $element) = @_;
 
@@ -250 +262 @@
 }
 
-sub EndTag {
+sub xml_end_tag {
+    my $self = shift(@_);
     my ($expat, $element) = @_;
 
@@ -291 +304 @@
 }
 
-sub Text {
+sub xml_text {
+    my $self = shift(@_);
 
     if ($self->{'in_filename'}) {