Changeset 21958

Show
Ignore:
Timestamp:
27.04.2010 11:18:22 (9 years ago)
Author:
kjdon
Message:

ppthtml and xslhtml don't seem to output utf8, so remove the input_encoding option to html/txt secondary plugins so that it will use textcat to work it out itself.

Location:
main/trunk/greenstone2/perllib/plugins
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm

    r20790 r21958  
    7979    my $text_options = $secondary_plugin_options->{'TextPlugin'}; 
    8080 
    81     push(@$html_options, "-input_encoding", "utf8"); 
     81    # xslhtml doesn't output utf8, let Greenstone work out the encoding 
     82    #push(@$html_options, "-input_encoding", "utf8"); 
    8283    push(@$html_options,"-extract_language") if $self->{'extract_language'}; 
    8384    push(@$html_options, "-file_rename_method", "none"); 
    8485    push(@$html_options, "-processing_tmp_files"); 
    8586 
    86     push(@$text_options, "-input_encoding", "utf8"); 
     87    #push(@$text_options, "-input_encoding", "utf8"); 
    8788    push(@$text_options,"-extract_language") if $self->{'extract_language'}; 
    8889    push(@$text_options, "-file_rename_method", "none"); 
  • main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm

    r20790 r21958  
    101101    $self->{'file_type'} = "PPT"; 
    102102 
    103     # ppthtml outputs utf-8 already. 
    104103    #these are passed through to gsConvert.pl by ConvertBinaryFile.pm 
    105104    $self->{'convert_options'} = "-windows_scripting" if $self->{'windows_scripting'}; 
     
    117116  
    118117    if (defined $html_options){ 
    119     push(@$html_options,"-input_encoding", "utf8"); 
     118    # ppthtml doesn't output utf-8 necessarily - let Greenstone determine the encoding 
     119    #push(@$html_options,"-input_encoding", "utf8"); 
    120120    push(@$html_options,"-extract_language") if $self->{'extract_language'}; 
    121121    push(@$html_options,"-file_rename_method", "none"); 
     
    128128    }  
    129129    if (defined $text_options){ 
    130     push(@$text_options,"-input_encoding", "utf8"); 
     130    #push(@$text_options,"-input_encoding", "utf8"); 
    131131    push(@$text_options,"-extract_language") if $self->{'extract_language'}; 
    132132    push(@$text_options,"-file_rename_method", "none"); 
    133133    } 
    134134    if (defined $pageimg_options){ 
     135    #is this true?? 
    135136    push(@$pageimg_options,"-input_encoding", "utf8"); 
    136137    push(@$pageimg_options,"-extract_language") if $self->{'extract_language'};