Changeset 21958
- Timestamp:
- 2010-04-27T11:18:22+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2/perllib/plugins
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/perllib/plugins/ExcelPlugin.pm
r20790 r21958 79 79 my $text_options = $secondary_plugin_options->{'TextPlugin'}; 80 80 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"); 82 83 push(@$html_options,"-extract_language") if $self->{'extract_language'}; 83 84 push(@$html_options, "-file_rename_method", "none"); 84 85 push(@$html_options, "-processing_tmp_files"); 85 86 86 push(@$text_options, "-input_encoding", "utf8");87 #push(@$text_options, "-input_encoding", "utf8"); 87 88 push(@$text_options,"-extract_language") if $self->{'extract_language'}; 88 89 push(@$text_options, "-file_rename_method", "none"); -
main/trunk/greenstone2/perllib/plugins/PowerPointPlugin.pm
r20790 r21958 101 101 $self->{'file_type'} = "PPT"; 102 102 103 # ppthtml outputs utf-8 already.104 103 #these are passed through to gsConvert.pl by ConvertBinaryFile.pm 105 104 $self->{'convert_options'} = "-windows_scripting" if $self->{'windows_scripting'}; … … 117 116 118 117 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"); 120 120 push(@$html_options,"-extract_language") if $self->{'extract_language'}; 121 121 push(@$html_options,"-file_rename_method", "none"); … … 128 128 } 129 129 if (defined $text_options){ 130 push(@$text_options,"-input_encoding", "utf8");130 #push(@$text_options,"-input_encoding", "utf8"); 131 131 push(@$text_options,"-extract_language") if $self->{'extract_language'}; 132 132 push(@$text_options,"-file_rename_method", "none"); 133 133 } 134 134 if (defined $pageimg_options){ 135 #is this true?? 135 136 push(@$pageimg_options,"-input_encoding", "utf8"); 136 137 push(@$pageimg_options,"-extract_language") if $self->{'extract_language'};
Note:
See TracChangeset
for help on using the changeset viewer.