Changeset 17735

Show
Ignore:
Timestamp:
06.11.2008 13:11:55 (11 years ago)
Author:
kjdon
Message:

removed convert_post_process as ppthtml produces utf8 already (I hope)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/PowerPointPlugin.pm

    r17722 r17735  
    2929 
    3030use ConvertBinaryFile; 
    31 use ReadTextFile; # for read_file in convert_post_process. do we need it? 
    3231 
    3332use strict; 
     
    3534 
    3635sub BEGIN { 
    37     @PowerPointPlugin::ISA = ('ConvertBinaryFile', 'ReadTextFile'); 
     36    @PowerPointPlugin::ISA = ('ConvertBinaryFile'); 
    3837} 
    3938 
     
    114113    my $html_options = $secondary_plugin_options->{'HTMLPlugin'}; 
    115114    my $pageimg_options = $secondary_plugin_options->{'PagedImagePlugin'}; 
    116  
    117 #    if ($self->{'input_encoding'} eq "auto") { 
    118 #   $self->{'input_encoding'} = "utf8"; 
    119 #    } 
    120115  
    121116    if (defined $secondary_plugin_options->{'HTMLPlugin'}){ 
     
    143138} 
    144139 
    145 # do we need this? above states that ppthtml produces utf8 text... 
    146 sub convert_post_process 
    147 { 
    148     my $self = shift (@_); 
    149     my ($conv_filename) = @_; 
    150  
    151     my $outhandle=$self->{'outhandle'}; 
    152     my ($language, $encoding) = $self->textcat_get_language_encoding ($conv_filename); 
    153     # read in file ($text will be in utf8) 
    154     my $text = ""; 
    155     $self->read_file ($conv_filename, $encoding, $language, \$text); 
    156   
    157     # turn any high bytes that aren't valid utf-8 into utf-8. 
    158     unicode::ensure_utf8(\$text); 
    159     # Write it out again! 
    160     $self->utf8_write_file (\$text, $conv_filename); 
    161 } 
    162  
    163  
    1641401; 
    165141