Changeset 11090 for trunk/gsdl/perllib/plugins/GMLPlug.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/GMLPlug.pm (modified) (1 diff)

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -82 +82 @@
     my $outhandle = $self->{'outhandle'};
 
-    my $filename = $file;
-    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
-
-    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));
+
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up