Changeset 28803

Timestamp:

2014-01-30T15:14:48+13:00 (10 years ago)

Author:

ak19

Message:

Testing with accented characters in MARC data showed up problems in how text strings were being handled in the XML-Parsing MARCXMLPlugin. These changes fix this.

File:

• main/trunk/greenstone2/perllib/plugins/MARCXMLPlugin.pm (modified) (3 diffs)

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

@@ -81 +81 @@
                                  'PluginObj' => $self,
                  'Namespaces' => 1, # strip out namespaces
-                 'Handlers' => {'Char' => \&ReadXMLFile::Char,
+                 'Handlers' => {'Char' => \&Char,
                         'XMLDecl' => \&ReadXMLFile::XMLDecl,
                         'Entity'  => \&ReadXMLFile::Entity,
@@ -157 +157 @@
 }
 
+
+sub Char {
+    # ReadXMLPlugin currently has 'use bytes' here, apparently to sort out
+    # an encoding issue.  Possible that the time that 'use bytes' was
+    # added in (to fix a problem) our understanding of Unicode in Perl
+    # wasn't completely correct
+
+    # Trialing out this new version (without 'use bytes') here for MarcXML data
+
+    $_[0]->{'Text'} .= $_[1];
+    return undef;
+}
+
 # Called for DOCTYPE declarations - use die to bail out if this doctype
 # is not meant for this plugin
@@ -319 +332 @@
     my $tmp_marcxml_filename = &util::get_tmp_filename("xml");
     if (open (XMLOUT,">$tmp_marcxml_filename")) {
+        binmode(XMLOUT,":utf8");
 
         print XMLOUT "<?xml-stylesheet type=\"text/xsl\" href=\"MARC21slim2English.xsl\"?>\n";