Changeset 10833

Timestamp:

2005-11-02T17:31:10+13:00 (18 years ago)

Author:

jrm21

Message:

store the names of files we've already checked when looking for a cover
image, otherwise splitplug documents (eg email from the same file) causes
lots of file accesses to check if the cover image exists, which is slow

File:

• trunk/gsdl/perllib/plugins/BasPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -538 +538 @@
 sub block_cover_image
 {
-    my $self =shift (@_);
-    my ($filename) = @_;
+    my $self =shift;
+    my $filename = shift;
+
+    if (exists $self->{'file_blocks'}->{$filename}) {
+    # we've already checked if this file exists, so don't stat() again.
+    # (eg for multi-sectioned files using SplitPlug)
+    return;
+    }
+
     if ($self->{'cover_image'}) {
     my $coverfile = $filename;
@@ -548 +555 @@
     if (-e $coverfile) {
         $self->{'file_blocks'}->{$coverfile} = 1;
+    } else {
+        $self->{'file_blocks'}->{$coverfile} = 0;
     }
     }
@@ -1447 +1456 @@
 
 sub associate_cover_image {
-    my $self = shift(@_);
+    my $self = shift;
     my ($doc_obj, $filename) = @_;
 
+    $filename =~ s/\.[^\\\/\.]+$/\.jpg/;
+    if (exists $self->{'covers_missing_cache'}->{$filename}) {
+    # don't stat() for existence eg for multiple document input files
+    # (eg SplitPlug)
+    return;
+    }
+
     my $top_section=$doc_obj->get_top_section();
 
-    $filename =~ s/\.[^\\\/\.]+$/\.jpg/;
     if (-e $filename) {
     $doc_obj->associate_file($filename, "cover.jpg", "image/jpeg");
     $doc_obj->add_utf8_metadata($top_section, "hascover",  1);
     } else {
-    $filename =~ s/jpg$/JPG/;
-    if (-e $filename) {
-        $doc_obj->associate_file($filename, "cover.jpg", "image/jpeg");
+    my $upper_filename = $filename;
+    $upper_filename =~ s/jpg$/JPG/;
+    if (-e $upper_filename) {
+        $doc_obj->associate_file($upper_filename, "cover.jpg",
+                     "image/jpeg");
         $doc_obj->add_utf8_metadata($top_section, "hascover",  1);
-    }
-    }
+    } else {
+        # file doesn't exist, so record the fact that it's missing so
+        # we don't stat() again (stat is slow)
+        $self->{'covers_missing_cache'}->{$filename} = 1;
+    }
+    }
+
 }