Changeset 13822

Timestamp:

2007-01-26T14:04:49+13:00 (17 years ago)

Author:

mdewsnip

Message:

A quick attempt to fix MetadataXMLPlug so it will parse metadata.xml files containing UTF-8 element names (ie. attribute values in the XML). Unfortunately, this seems to work differently depending on the version of Perl. Not tested on Windows!

File:

• trunk/gsdl/perllib/plugins/MetadataXMLPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/MetadataXMLPlug.pm

@@ -132 +132 @@
     
     # create XML::Parser object for parsing metadata.xml files
-    my $parser = new XML::Parser('Style' => 'Stream',
-                 'Handlers' => {'Char' => \&Char,
-                        'Doctype' => \&Doctype
-                        });
-    
+    my $parser;
+    if ($]<5.008) {
+    # Perl 5.6
+    $parser = new XML::Parser('Style' => 'Stream',
+                  'Handlers' => {'Char' => \&Char,
+                         'Doctype' => \&Doctype
+                         });
+    }
+    else {
+    # Perl 5.8
+    $parser = new XML::Parser('Style' => 'Stream',
+                  'ProtocolEncoding' => 'ISO-8859-1',
+                  'Handlers' => {'Char' => \&Char,
+                         'Doctype' => \&Doctype
+                         });
+    }
+
     $self->{'parser'} = $parser;
     $self->{'in_filename'} = 0;
@@ -262 +274 @@
 # things down significantly in some cases.
 sub Char {
-    use bytes;  # Necessary to prevent encoding issues with XML::Parser 2.31+
+    if ($]<5.008) {
+    use bytes;  # Necessary to prevent encoding issues with XML::Parser 2.31+ and Perl 5.6
+    }
     $_[0]->{'Text'} .= $_[1];
     return undef;