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

Timestamp:

2010-09-06T19:08:11+12:00 (14 years ago)

Author:

davidb

Message:

Further adjustments to our reading in of text files/data to be Unicode aware. These changes address the issue of when the data being read in is in a different encoding. The key 'problem' was that the (now) Unicode aware was being erroneously being re-encoded within HTMLPlugin

File:

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

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

@@ -89 +89 @@
 use strict;
 no strict 'refs';
+
+use Encode;
+
 use BasePlugin;
 use util;
@@ -339 +342 @@
     }
     elsif ($element eq "Metadata") {
-    &metadatautil::store_saved_metadata($self,$self->{'metadata_name'}, $self->{'metadata_value'}, $self->{'metadata_accumulate'});
+    my $metadata_name = decode("utf8",$self->{'metadata_name'});
+    my $metadata_value = decode("utf8",$self->{'metadata_value'});
+    
+    &metadatautil::store_saved_metadata($self,
+                        $metadata_name, $metadata_value, 
+                        $self->{'metadata_accumulate'});
     $self->{'metadata_name'} = "";
     }