Changeset 17735

Timestamp:

2008-11-06T13:11:55+13:00 (15 years ago)

Author:

kjdon

Message:

removed convert_post_process as ppthtml produces utf8 already (I hope)

File:

• gsdl/trunk/perllib/plugins/PowerPointPlugin.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugins/PowerPointPlugin.pm

@@ -29 +29 @@
 
 use ConvertBinaryFile;
-use ReadTextFile; # for read_file in convert_post_process. do we need it?
 
 use strict;
@@ -35 +34 @@
 
 sub BEGIN {
-    @PowerPointPlugin::ISA = ('ConvertBinaryFile', 'ReadTextFile');
+    @PowerPointPlugin::ISA = ('ConvertBinaryFile');
 }
 
@@ -114 +113 @@
     my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
     my $pageimg_options = $secondary_plugin_options->{'PagedImagePlugin'};
-
-#    if ($self->{'input_encoding'} eq "auto") {
-#   $self->{'input_encoding'} = "utf8";
-#    }
  
     if (defined $secondary_plugin_options->{'HTMLPlugin'}){
@@ -143 +138 @@
 }
 
-# do we need this? above states that ppthtml produces utf8 text...
-sub convert_post_process
-{
-    my $self = shift (@_);
-    my ($conv_filename) = @_;
-
-    my $outhandle=$self->{'outhandle'};
-    my ($language, $encoding) = $self->textcat_get_language_encoding ($conv_filename);
-    # read in file ($text will be in utf8)
-    my $text = "";
-    $self->read_file ($conv_filename, $encoding, $language, \$text);
- 
-    # turn any high bytes that aren't valid utf-8 into utf-8.
-    unicode::ensure_utf8(\$text);
-    # Write it out again!
-    $self->utf8_write_file (\$text, $conv_filename);
-}
-
-
 1;