Changeset 23349 for main/trunk/greenstone2/perllib/plugins/OpenDocumentPlugin.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/OpenDocumentPlugin.pm (modified) (1 diff)

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

@@ -264 +264 @@
     $doc_obj->add_metadata ("", "srclink_file", $doc_obj->get_sourcefile());
     $doc_obj->add_utf8_metadata ("", "srcicon",  "<img border=\"0\" align=\"absmiddle\" src=\"_httpprefix_/collect/[collection]/index/assoc/[assocfilepath]/thumbnail.png\" alt=\"View the Open document\" title=\"View the Open document\">"); 
-    $self->set_Source_metadata($doc_obj, $file_only);
+
+    my $plugin_filename_encoding = $self->{'filename_encoding'};
+    my $filename_encoding = $self->deduce_filename_encoding($file_only,$metadata,$plugin_filename_encoding);
+
+    $self->set_Source_metadata($doc_obj, $file_only, $filename_encoding);
      $doc_obj->set_utf8_metadata_element("", "FileSize", (-s $filename));