Changeset 8909

Timestamp:

2005-01-19T01:14:50+13:00 (19 years ago)

Author:

davidb

Message:

PageImgPlug updated so read function follows more consistently the elements of
BasPlug read.

File:

• trunk/gsdl/perllib/plugins/PagedImgPlug.pm (modified) (3 diffs)

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -502 +502 @@
     my $self = shift (@_);
     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs) = @_;
-    my $outhandle = $self->{'outhandle'};
+
+    my $outhandle   = $self->{'outhandle'};
+    my $smart_block = $self->{'smart_block'};
 
     my $filename = &util::filename_cat($base_dir, $file);
-    return 0 if $self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/;
+
+    if ($self->associate_with($file,$filename,$metadata)) {
+    # a form of smart block
+    $self->{'num_blocked'} ++;
+    return 0; # blocked
+    }
+
+    if ($smart_block) {
+    if (defined $self->{'file_blocks'}->{$filename} && $self->{'file_blocks'}->{$filename} == 1){
+        $self->{'num_blocked'} ++;
+        return 0; # blocked
+    }
+    } elsif ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
+    $self->{'num_blocked'} ++;
+    return 0; # blocked
+    }
+
     if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
     return undef;
@@ -518 +536 @@
     #process the .item file
     my $doc_obj = $self->process_item($filename, $dir, $file, $processor);
+
+    if ($self->{'cover_image'}) {
+    $self->associate_cover_image($doc_obj, $filename);
+    }
 
     # include any metadata passed in from previous plugins 
@@ -570 +592 @@
     $doc_obj->set_utf8_metadata_element ($topsection, "gsdlthistype", "Hierarchy");
     }
+
     open (ITEMFILE, $filename) || die "couldn't open $filename\n";
     my $line = "";