Changeset 18406 for gsdl/trunk/perllib/plugins/PowerPointPlugin.pm

Timestamp:

2009-01-19T18:08:49+13:00 (15 years ago)

Author:

ak19

Message:

Modified srcreplaceable plugins (plugins which operate on docs where the source file can be replaced with their converted htmls) to set the file_rename_method to none for secondary plugins (for Text, HTML, and PagedImage plugins) so that the file is not renamed several times.

File:

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

gsdl/trunk/perllib/plugins/PowerPointPlugin.pm

@@ -106 +106 @@
     my $secondary_plugin_options = $self->{'secondary_plugin_options'};
 
-    if ($self->{'windows_scripting'} && ($self->{'convert_to'} eq "PagedImg")) {
+    if ($self->{'windows_scripting'} && ($self->{'convert_to'} =~ m/(pagedimage|pagedimg).*/i)) {
     $secondary_plugin_options->{'PagedImagePlugin'} = [];
     } else {
     $secondary_plugin_options->{'HTMLPlugin'} = [];
+    $secondary_plugin_options->{'TextPlugin'} = [];
     }
     my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
+    my $text_options = $secondary_plugin_options->{'TextPlugin'};
     my $pageimg_options = $secondary_plugin_options->{'PagedImagePlugin'};
  
-    if (defined $secondary_plugin_options->{'HTMLPlugin'}){
+    if (defined $html_options){
     push(@$html_options,"-input_encoding", "utf8");
     push(@$html_options,"-extract_language") if $self->{'extract_language'};
+    push(@$html_options,"-file_rename_method", "none");
     
     # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj) 
@@ -122 +125 @@
     push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
     } 
-    if (defined $secondary_plugin_options->{'PagedImagePlugin'}){
+    if (defined $text_options){
+    push(@$text_options,"-input_encoding", "utf8");
+    push(@$text_options,"-extract_language") if $self->{'extract_language'};
+    push(@$text_options,"-file_rename_method", "none");
+    }
+    if (defined $pageimg_options){
     push(@$pageimg_options,"-input_encoding", "utf8");
-    push(@$pageimg_options,"-extract_language") if $self->{'extract_language'};
+    push(@$pageimg_options,"-extract_language") if $self->{'extract_language'}; 
+    push(@$pageimg_options,"-file_rename_method", "none");
     }