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

Timestamp:

2011-04-11T16:55:18+12:00 (13 years ago)

Author:

sjm84

Message:

Modified several Perl files to merge the locations where XML::Parser checked for the current version of perl into one location. Also tidied up several locations where a difference was specified between 5.6 and 5.8+ to do with ProtocolEncoding being used to initialise an XML::Parser. Given the recent "

File:

• main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm (modified) (1 diff)

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

@@ -133 +133 @@
     }
     
+    # The following used to be passed in as a parameter to XML::Parser,
+    # if the version of perl was greater than or equal to 5.8. 
+    # The svn commit comment explaining the reason for adding this was
+    # not very clear and also said that it was quick fix and hadn't
+    # been tested under windows. 
+    # More recent work has been to make strings in Perl "Unicode-aware"
+    # and so this line might actually be potentially harmful, however
+    # it is not the case that we encountered an actual error leading to
+    # its removal, rather it has been eliminated in an attempt to tighten
+    # up the code. For example, this protocol encoding is not used in
+    # ReadXMLFile.
+    # 'ProtocolEncoding' => 'ISO-8859-1',
+
     # create XML::Parser object for parsing metadata.xml files
-    my $parser;
-    if ($]<5.008) {
-    # Perl 5.6
-    $parser = new XML::Parser('Style' => 'Stream',
+    my $parser = new XML::Parser('Style' => 'Stream',
                                   'PluginObj' => $self,
+                                  'Pkg' => 'MetadataXMLPlugin',
                   'Handlers' => {'Char' => \&Char,
                          'Doctype' => \&Doctype
                          });
-    }
-    else {
-    # Perl 5.8 or greater
-    $parser = new XML::Parser('Style' => 'Stream',
-                                  'PluginObj' => $self,
-                  'ProtocolEncoding' => 'ISO-8859-1',
-                  'Handlers' => {'Char' => \&Char,
-                         'Doctype' => \&Doctype
-                         });
-    }
 
     $self->{'parser'} = $parser;