Changeset 23895 for main/trunk/greenstone2/perllib/collConfigxml.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/collConfigxml.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/collConfigxml.pm

@@ -31 +31 @@
 no strict 'subs';
 
-# Wrapper that ensures the right version of XML::Parser is loaded given
-# the version of Perl being used.  Need to distinguish between Perl 5.6 and
-# Perl 5.8
-sub BEGIN {
-    my $perl_dir;
-
-    # Note: $] encodes the version number of perl
-    if ($]>=5.010) { 
-    $perl_dir = "perl-5.10";
-    }
-    elsif ($]>5.008) { 
-    # perl 5.8.1 or above
-    $perl_dir = "perl-5.8";
-    }
-    elsif ($]<5.008) {
-    # assume perl 5.6
-    $perl_dir = "perl-5.6";
-    }
-    else {
-    print STDERR "Warning: Perl 5.8.0 is not a maintained release.\n";
-    print STDERR "         Please upgrade to a newer version of Perl.\n";
-    $perl_dir = "perl-5.8";
-    }
-
-    if ($ENV{'GSDLOS'} !~ /^windows$/i) {
-    # Use push to put this on the end, so an existing XML::Parser will be used by default
-    push (@INC, "$ENV{'GSDLHOME'}/perllib/cpan/$perl_dir");
-    }
-}
-
-use XML::Parser;
+use XMLParser;
 
 # A mapping hash to resolve name discrepancy between gs2 and gs3.
@@ -126 +96 @@
     }
 
+    # Removed ProtocolEncoding (see MetadataXMLPlugin for details)
+
     # create XML::Parser object for parsing metadata.xml files
-    my $parser;
-    if ($]<5.008) {
-    # Perl 5.6
-    $parser = new XML::Parser('Style' => 'Stream',
-                  'Handlers' => {'Char' => \&Char,
+    my $parser = new XML::Parser('Style' => 'Stream',
+                 'Pkg' => 'collConfigxml',
+                 'Handlers' => {'Char' => \&Char,
                          'Doctype' => \&Doctype
                          });
-    }
-    else {
-    # Perl 5.8
-    $parser = new XML::Parser('Style' => 'Stream',
-                  'ProtocolEncoding' => 'ISO-8859-1',
-                  'Handlers' => {'Char' => \&Char,
-                         'Doctype' => \&Doctype
-                         });
-    }
-
     if (!open (COLCFG, $filename)) {
     print STDERR "cfgread::read_cfg_file couldn't read the cfg file $filename\n";