Changeset 20791 for gsdl/trunk

Timestamp:

2009-10-07T15:54:37+13:00 (15 years ago)

Author:

kjdon

Message:

new option -processing_tmp_files - if set, then don't store the assicated files using associate_source_file - we don't want to store tmp files in the archivesinf databases

Location:

gsdl/trunk/perllib/plugins

Files:

• HTMLPlugin.pm (modified) (3 diffs)
• PagedImagePlugin.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/HTMLPlugin.pm

@@ -114 +114 @@
       { 'name' => "old_style_HDL",
         'desc' => "{HTMLPlugin.old_style_HDL}",
-    'type' => "flag"}
+    'type' => "flag"},
+      {'name' => "processing_tmp_files",
+       'desc' => "{BasePlugin.processing_tmp_files}",
+       'type' => "flag",
+       'hiddengli' => "yes"}
       ];
 
@@ -147 +151 @@
 # may want to use (?i)\.(gif|jpe?g|jpe|png|css|js(?:@.*)?)$
 # if have eg <script language="javascript" src="img/lib.js@123">
+# blocking is now done by reading through the file and recording all the 
+# images and other files
 sub get_default_block_exp {
     my $self = shift (@_);
@@ -758 +764 @@
     }
     # add the original image file as a source file
-    $doc_obj->associate_source_file($filename);
+    if (!$self->{'processing_tmp_files'} ) {
+    $doc_obj->associate_source_file($filename);
+    }
     if ($self->{'rename_assoc_files'}) {
     if (defined $self->{'aux_files'}->{$href}) {

gsdl/trunk/perllib/plugins/PagedImagePlugin.pm

@@ -175 +175 @@
     'list' => $type_list,
     'deft' => "paged",
-    'reqd' => "no" } ];
+    'reqd' => "no" },
+      {'name' => "processing_tmp_files",
+       'desc' => "{BasePlugin.processing_tmp_files}",
+       'type' => "flag",
+       'hiddengli' => "yes"}
+];
 
 
@@ -397 +402 @@
     return 0 if ($filename_no_path eq "" || !-f $filename_full_path);
  
-    # remember that this image file was one of our source files
-    $doc_obj->associate_source_file($filename_full_path);
- 
+    # remember that this image file was one of our source files, but only 
+    # if we are not processing a tmp file
+    if (!$self->{'processing_tmp_files'} ) {
+    $doc_obj->associate_source_file($filename_full_path);
+    }
     # do rotation
     if  ((defined $rotate) && ($rotate eq "r")) {
@@ -620 +627 @@
     }
 
-    # remember that this text file was one of our source files
-    $doc_obj->associate_source_file($filename_full_path);
+    # remember that this text file was one of our source files, but only 
+    # if we are not processing a tmp file
+    if (!$self->{'processing_tmp_files'} ) {
+    $doc_obj->associate_source_file($filename_full_path);
+    }
     # Do encoding stuff
     my ($language, $encoding) = $self->textcat_get_language_encoding ($filename_full_path);