Changeset 18406

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.

Location:

gsdl/trunk/perllib/plugins

Files:

• CONTENTdmPlugin.pm (modified) (1 diff)
• ExcelPlugin.pm (modified) (1 diff)
• PDFPlugin.pm (modified) (1 diff)
• PostScriptPlugin.pm (modified) (2 diffs)
• PowerPointPlugin.pm (modified) (2 diffs)
• RTFPlugin.pm (modified) (1 diff)
• WordPlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm

@@ -131 +131 @@
     push(@$pagedimg_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
     push(@$pagedimg_options, "-create_thumbnail", "true", "-create_screenview", "true");
-
+    push(@$pagedimg_options, "-file_rename_method", "none");
 
     $self = bless $self, $class;

gsdl/trunk/perllib/plugins/ExcelPlugin.pm

@@ -73 +73 @@
     $secondary_plugin_options->{'HTMLPlugin'} = [];
     }
+    if (!defined $secondary_plugin_options->{'TextPlugin'}) {
+    $secondary_plugin_options->{'TextPlugin'} = [];
+    }
     my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
-    
+    my $text_options = $secondary_plugin_options->{'TextPlugin'};
+
     push(@$html_options, "-input_encoding", "utf8");
     push(@$html_options,"-extract_language") if $self->{'extract_language'};
+    push(@$html_options, "-file_rename_method", "none");
+    
+    push(@$text_options, "-input_encoding", "utf8");
+    push(@$text_options,"-extract_language") if $self->{'extract_language'};
+    push(@$text_options, "-file_rename_method", "none");
+
     $self = bless $self, $class;
     

gsdl/trunk/perllib/plugins/PDFPlugin.pm

@@ -186 +186 @@
     push(@$html_options, "-associate_tail_re", $associate_tail_re);
     push(@$text_options, "-associate_tail_re", $associate_tail_re);
-    push(@$pagedimg_options, "-associate_tail_re", $associate_tail_re);
-    }
-
- 
+    push(@$pagedimg_options, "-associate_tail_re", $associate_tail_re) if defined $pagedimg_options;
+    }
+
+    push(@$html_options, "-file_rename_method", "none");
+    push(@$text_options, "-file_rename_method", "none");
+    push(@$pagedimg_options, "-file_rename_method", "none") if defined $pagedimg_options;
+
     $self = bless $self, $class;
     $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);

gsdl/trunk/perllib/plugins/PostScriptPlugin.pm

@@ -112 +112 @@
     }
 
+    if (!defined $secondary_plugin_options->{'HTMLPlugin'}) {
+    $secondary_plugin_options->{'HTMLPlugin'} = [];
+    }
+
     my $text_options = $secondary_plugin_options->{'TextPlugin'};
-
-    if (defined $self->{'convert_to'} && $self->{'convert_to'} =~ /pagedimg.*/i) {
+    my $html_options = $secondary_plugin_options->{'HTMLPlugin'};
+
+    if (defined $self->{'convert_to'} && $self->{'convert_to'} =~ m/(pagedimage|pagedimg).*/i) {
     if (!defined $secondary_plugin_options->{'PagedImagePlugin'}){
         $secondary_plugin_options->{'PagedImagePlugin'} = [];
         my $pagedimg_options = $secondary_plugin_options->{'PagedImagePlugin'}; 
         push(@$pagedimg_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+        push(@$pagedimg_options, "-file_rename_method", "none");
     }
     }
@@ -130 +136 @@
     push(@$text_options , "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
 
+    push(@$text_options, "-file_rename_method", "none");
+    push(@$html_options, "-file_rename_method", "none");
+    
     $self = bless $self, $class;
     # used for convert_post_process

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");
     }
 

gsdl/trunk/perllib/plugins/RTFPlugin.pm

@@ -88 +88 @@
     push(@$html_options,"-extract_language") if $self->{'extract_language'};
 
+    push(@$html_options, "-file_rename_method", "none");
+    push(@$text_options, "-file_rename_method", "none");
+
     $self = bless $self, $class;
 

gsdl/trunk/perllib/plugins/WordPlugin.pm

@@ -131 +131 @@
         # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj)
         # to extract these metadata fields from the HEAD META fields
-        push (@$structhtml_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
-        push (@$structhtml_options , "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
+        push (@$structhtml_options, "-metadata_fields","Title,GENERATOR,date,author<Creator>");
+        push (@$structhtml_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
         push (@$structhtml_options, "-description_tags") if $self->{'windows_scripting'};
-        push(@$structhtml_options,"-extract_language") if $self->{'extract_language'};
+        push (@$structhtml_options, "-extract_language") if $self->{'extract_language'};
         push (@$structhtml_options, "-delete_toc") if $self->{'delete_toc'};
         push (@$structhtml_options, "-toc_header", $self->{'toc_header'}) if $self->{'toc_header'};
@@ -168 +168 @@
     push(@$html_options, "-associate_tail_re", $associate_tail_re);
     push(@$text_options, "-associate_tail_re", $associate_tail_re);
-    push(@$structhtml_options, "-associate_tail_re", $associate_tail_re);
-    }
-       
+    push(@$structhtml_options, "-associate_tail_re", $associate_tail_re) if defined $structhtml_options;
+    }
+
+    push(@$html_options, "-file_rename_method", "none");
+    push(@$text_options, "-file_rename_method", "none");
+    push(@$structhtml_options, "-file_rename_method", "none") if defined $structhtml_options;
+
     $self = bless $self, $class;
     $self->load_secondary_plugins($class,$secondary_plugin_options,$hashArgOptLists);