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

trunk/gsdl/perllib/plugins/SplitPlug.pm

@@ -93 +93 @@
     $self->{'process_exp'} = $self->get_default_process_exp ();
     if ($self->{'process_exp'} eq "") {
-        warn ref($self) . " Warning: Non-recursive plugin has no process_exp\n";
+        warn ref($self) . " Warning: plugin has no process_exp\n";
     }
     }
@@ -185 +185 @@
     my $verbosity = $self->{'verbosity'};
 
-    # Figure out the exact filename of this file (and maybe block it)
-    my $filename = &util::filename_cat($base_dir, $file);
-    my $block_exp = $self->{'block_exp'};
-    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
 
@@ -228 +225 @@
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "SourceSegment", "$segment");
     if ($self->{'cover_image'}) {
-      $self->associate_cover_image($doc_obj, $filename);
+        $self->associate_cover_image($doc_obj, $filename);
     }
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");