Changeset 10769

Timestamp:

2005-10-26T11:56:02+13:00 (18 years ago)

Author:

mdewsnip

Message:

When processing Word documents in an 8-bit encoding wvWare would correctly convert the documents to Unicode, but then HTMLPlug would incorrectly convert them again. Now sets the input_encoding option of the secondary HTMLPlug to "utf8" always.

File:

• trunk/gsdl/perllib/plugins/WordPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/WordPlug.pm

@@ -153 +153 @@
     my $text_options = $secondary_plugin_options->{'TextPlug'};
     
-    # wvWare will always produce html files encoded as utf-8
+    # wvWare will always produce html files encoded as utf-8, so make sure the secondary HTMLPlug knows this
+    push(@$html_options,"-input_encoding", "utf8");
     if ($self->{'input_encoding'} eq "auto") {
     $self->{'input_encoding'} = "utf8";
     $self->{'extract_language'} = 1;
-    push(@$html_options,"-input_encoding", "utf8");
     push(@$html_options,"-extract_language");
     }