Changeset 20790 for gsdl/trunk

Timestamp:

2009-10-07T15:53:19+13:00 (15 years ago)

Author:

kjdon

Message:

set -processing_tmp_files option to secondary HTML and PagedImage plugins so that the associated files in tmp are not stored as source associated files (used by incremental build to work out what needs reimporting)

Location:

gsdl/trunk/perllib/plugins

Files:

• CONTENTdmPlugin.pm (modified) (2 diffs)
• 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) (1 diff)

gsdl/trunk/perllib/plugins/CONTENTdmPlugin.pm

@@ -134 +134 @@
     push(@$pagedimg_options, "-create_thumbnail", "true", "-create_screenview", "true");
     push(@$pagedimg_options, "-file_rename_method", "none");
-
+    push(@$pagedimg_options, "-processing_tmp_files");
     $self = bless $self, $class;
 
@@ -345 +345 @@
         else {
         $imgfile = &util::filename_cat("..","import",$imgfile);
-        $imgfile = "../import/".$imgfile;
         }
 

gsdl/trunk/perllib/plugins/ExcelPlugin.pm

@@ -82 +82 @@
     push(@$html_options,"-extract_language") if $self->{'extract_language'};
     push(@$html_options, "-file_rename_method", "none");
-    
+    push(@$html_options, "-processing_tmp_files");
+
     push(@$text_options, "-input_encoding", "utf8");
     push(@$text_options,"-extract_language") if $self->{'extract_language'};

gsdl/trunk/perllib/plugins/PDFPlugin.pm

@@ -162 +162 @@
     push(@$html_options,"-input_encoding", "utf8");
     push(@$html_options,"-extract_language") if $self->{'extract_language'};
+
+    push(@$html_options, "-processing_tmp_files");
+    push(@$pagedimg_options, "-processing_tmp_files");
+
     # Instruct HTMLPlug (when eventually accessed through read_into_doc_obj) 
     # to extract these metadata fields from the HEAD META fields

gsdl/trunk/perllib/plugins/PostScriptPlugin.pm

@@ -125 +125 @@
         push(@$pagedimg_options, "-title_sub", '^(Page\s+\d+)?(\s*1\s+)?');
         push(@$pagedimg_options, "-file_rename_method", "none");
+        push(@$pagedimg_options, "-processing_tmp_files");
     }
     }
@@ -139 +140 @@
     push(@$html_options, "-file_rename_method", "none");
     
+    # tell the secondary plugins that they are processing tmp files
+    push(@$html_options, "-processing_tmp_files");
+
     $self = bless $self, $class;
     # used for convert_post_process

gsdl/trunk/perllib/plugins/PowerPointPlugin.pm

@@ -121 +121 @@
     push(@$html_options,"-file_rename_method", "none");
     
+    push(@$html_options, "-processing_tmp_files");
+    
     # Instruct HTMLPlugin (when eventually accessed through read_into_doc_obj) 
     # to extract these metadata fields from the HEAD META fields
@@ -134 +136 @@
     push(@$pageimg_options,"-extract_language") if $self->{'extract_language'}; 
     push(@$pageimg_options,"-file_rename_method", "none");
+    push(@$pageimg_options, "-processing_tmp_files");
     }
 

gsdl/trunk/perllib/plugins/RTFPlugin.pm

@@ -91 +91 @@
     push(@$text_options, "-file_rename_method", "none");
 
+    # tell the secondary plugins that they are processing tmp files
+    push(@$html_options, "-processing_tmp_files");
+
     $self = bless $self, $class;
 

gsdl/trunk/perllib/plugins/WordPlugin.pm

@@ -151 +151 @@
     my $text_options = $secondary_plugin_options->{'TextPlugin'};
     my $structhtml_options = $secondary_plugin_options->{'StructuredHTMLPlugin'};    
+    # tell the secondary plugins that they are processing tmp files
+    push(@$html_options, "-processing_tmp_files");
+    push(@$structhtml_options, "-processing_tmp_files");
+    
     # wvWare will always produce html files encoded as utf-8, so make sure the secondary HTMLPlugin knows this
     push(@$html_options,"-input_encoding", "utf8");