Changeset 25743

Timestamp:

2012-06-05T13:40:28+12:00 (12 years ago)

Author:

kjdon

Message:

if we happen to have a file and matching process expression that doesn't have a file extension, eg 'mbox' instead of 'xxx.mbox', then block_cover_image will block the file as replacing .xxx with .jpg will not do anything, and the file will exist and be blocked. So check that we have actually generated a new filename before seeing if it exists

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -438 +438 @@
     $coverfile =~ s/\.[^\\\/\.]+$/\.jpg/;
 
+    #if there is no file extension, coverfile will be the same as filename
+    return if $coverfile eq $filename;
+    
     if (!&util::fd_exists($coverfile)) {
         $coverfile =~ s/jpg$/JPG/;