Changeset 11090 for trunk/gsdl/perllib/plugins/ImagePlug.pm

Timestamp:

2006-01-24T10:29:34+13:00 (18 years ago)

Author:

kjdon

Message:

made all plugins that implement read() call read_block to check process_exp, block_exp, smart blocking, cover image blocking etc

File:

• trunk/gsdl/perllib/plugins/ImagePlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/ImagePlug.pm

@@ -337 +337 @@
 
 
-# The ImagePlug read() function. This function does all the right things
-# to make general options work for a given plugin. It calls the process()
-# function which does all the work specific to a plugin (like the old
-# read functions used to do). Most plugins should define their own 
-# process() function and let this read() function keep control.
-#
+# The ImagePlug read() function. 
 # ImagePlug overrides read() because there is no need to read the actual 
 # text of the file in, because the contents of the file is not text...
@@ -356 +351 @@
     my $outhandle = $self->{'outhandle'};
 
-    my $filename = &util::filename_cat($base_dir, $file);
-    return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;
-    if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
-    return undef;
-    }
+    #check process and block exps, smart block, etc
+    my ($block_status,$filename) = $self->read_block(@_);    
+    return $block_status if ((!defined $block_status) || ($block_status==0));
 
     print STDERR "<Processing n='$file' p='ImagePlug'>\n" if ($gli);