Changeset 23349 for main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm

Timestamp:

2010-11-26T12:09:53+13:00 (13 years ago)

Author:

davidb

Message:

More careful use of encoding parameter to $self->set_Source_metadata so it reflects the *filename* encoding that Greenstone has worked out, not the encoding for the *content* of the file, which of course could be completely different!

File:

• main/trunk/greenstone2/perllib/plugins/OAIPlugin.pm (modified) (1 diff)

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

@@ -297 +297 @@
     
     my ($filemeta) = $file =~ /([^\\\/]+)$/;
-    $self->set_Source_metadata($doc_obj, $filemeta, $encoding);
+    my $plugin_filename_encoding = $self->{'filename_encoding'};
+    my $filename_encoding = $self->deduce_filename_encoding($file,$metadata,$plugin_filename_encoding);
+    $self->set_Source_metadata($doc_obj, $filemeta, $filename_encoding);
+
     $doc_obj->add_utf8_metadata($top_section, "Language", $language);
     $doc_obj->add_utf8_metadata($top_section, "Encoding", $encoding);