Changeset 23810 for main/trunk/greenstone2

Timestamp:

2011-03-24T10:20:25+13:00 (13 years ago)

Author:

sjm84

Message:

Fixing EmbeddedMetadataPlugin to be Unicode compatible

File:

• main/trunk/greenstone2/perllib/plugins/EmbeddedMetadataPlugin.pm (modified) (7 diffs)

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

@@ -30 +30 @@
 use BasePlugin;
 
+use Encode;
 use Image::ExifTool qw(:Public);
 use strict;
@@ -39 +40 @@
 {
   @EmbeddedMetadataPlugin::ISA = ('BasePlugin');
-}
-
-
+  binmode(STDERR, ":utf8");
+}
+
+my $encoding_plus_auto_list = 
+    [ { 'name' => "auto",
+    'desc' => "{ReadTextFile.input_encoding.auto}" } ];
+push(@{$encoding_plus_auto_list},@{$BasePlugin::encoding_list});
 
 my $arguments =
@@ -47 +52 @@
     'desc' => "{HTMLPlugin.metadata_field_separator}",
     'type' => "string",
-    'deft' => "" }
-
+    'deft' => "" },
+      { 'name' => "input_encoding",
+    'desc' => "{ReadTextFile.input_encoding}",
+    'type' => "enum",
+    'list' => $encoding_plus_auto_list,
+    'reqd' => "no",
+    'deft' => "auto" }
 ];
 
@@ -136 +146 @@
 
         my $field = "ex.$group.$tag";
+        
+            my $encoding = $self->{'input_encoding'};
+            if($encoding eq "auto")
+            {
+                $encoding = "utf8"
+            }
+        
+            
 
         if (!defined $exif_metadata{$field})
@@ -142 +160 @@
         }
 
+        $field = Encode::decode($encoding,$field);
         my $metadata_done = 0;
         if (ref $value eq 'SCALAR') {
@@ -158 +177 @@
             $metadata_done = 1;
             foreach my $v (@$value) {
+            $v = Encode::decode($encoding,$v);
             push (@{$exif_metadata{$field}}, $self->gsSafe($v));
             ++$metadata_count;
@@ -163 +183 @@
         }
         else {
-            if (defined $separator) {
+            $value = Encode::decode($encoding,$value);
+            if (defined $separator) {
             my @vs = split($separator, $value);
             $metadata_done = 1;