Changeset 11090 for trunk/gsdl/perllib/plugins/XMLPlug.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/XMLPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/plugins/XMLPlug.pm

@@ -69 +69 @@
     $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
 
+    if ($self->{'info_only'}) {
+    # don't worry about any options etc
+    return bless $self, $class;
+    }
+
     my $parser = new XML::Parser('Style' => 'Stream',
                  'Handlers' => {'Char' => \&Char,
@@ -153 +158 @@
     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
 
-    my $filename = $file;
-    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
-
-    if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
-    $self->{'num_blocked'} ++;
-    return 0;
-    }
-    if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
-    return undef;
-    }
+    # Make sure we're processing the correct file, do blocking 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