Changeset 11089 for trunk/gsdl/perllib/plugins/BasPlug.pm

Timestamp:

2006-01-24T10:23:40+13:00 (18 years ago)

Author:

kjdon

Message:

removed a couple of unnecessary bits of code like repeated arguments, changed cover image stuff - these are now blocked even if smart block is off (when cover image is on)

File:

• trunk/gsdl/perllib/plugins/BasPlug.pm (modified) (11 diffs)

trunk/gsdl/perllib/plugins/BasPlug.pm

@@ -99 +99 @@
     'desc' => "{BasPlug.smart_block}",
     'type' => "flag",
-    'reqd' => "no" },
+    'reqd' => "no",
+    'hiddengli' => "yes"  },
       { 'name' => "associate_ext",
     'desc' => "{BasPlug.associate_ext}",
@@ -183 +184 @@
     'reqd' => "no",
     'hiddengli' => "yes" },
-      { 'name' => "smart_block",
-    'desc' => "{BasPlug.smart_block}",
-    'type' => "flag",
-    'reqd' => "no",
-    'hiddengli' => "yes" },
       { 'name' => "new_extract_email",
     'desc' => "",
@@ -413 +409 @@
     $self->{'cover_image'} = 1; # cover image is on by default
     $self->{'cover_image'} = 0 if ($self->{'no_cover_image'});
-    $self->{'file_blocks'} = {};
     #$self->{'option_list'} = $hashArgOptLists->{"OptList"};
     
@@ -447 +442 @@
     }
     }
+
     return bless $self, $class;
     
@@ -479 +475 @@
     $self->{'block_exp'} = $self->get_default_block_exp ();
     }
+
 }
 
@@ -534 +531 @@
     my $self =shift;
     my $filename = shift;
-
-    if (exists $self->{'file_blocks'}->{$filename}) {
-    # we've already checked if this file exists, so don't stat() again.
-    # (eg for multi-sectioned files using SplitPlug)
-    return;
-    }
 
     if ($self->{'cover_image'}) {
@@ -549 +540 @@
     if (-e $coverfile) {
         $self->{'file_blocks'}->{$coverfile} = 1;
-    } else {
-        $self->{'file_blocks'}->{$coverfile} = 0;
-    }
+    } 
     }
 
@@ -599 +588 @@
 
     # do smart blocking if appropriate
-    if (defined $self->{'smart_block'}) {
+    if ($self->{'smart_block'}) {
+    $self->store_block_files($filename);
+    }
+    # block the cover image if there is one
+    if ($self->{'cover_image'}) {
     $self->block_cover_image($filename);
-    $self->store_block_files($filename);
     }
        
@@ -714 +706 @@
     my $smart_block = $self->{'smart_block'};
     my $smart_block_BN = $self->{'smart_block_BN'};
-
+   
     if ($smart_block || $smart_block_BN) {
     if (defined $self->{'file_blocks'}->{$filename} && $self->{'file_blocks'}->{$filename} == 1){
@@ -720 +712 @@
         return (0,undef); # blocked
     }
-    } elsif ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
-    $self->{'num_blocked'} ++;
-    return (0,undef); # blocked
-    }
-    
+    } else {
+    if ($self->{'block_exp'} ne "" && $filename =~ /$self->{'block_exp'}/) {
+        $self->{'num_blocked'} ++;
+        return (0,undef); # blocked
+    }
+    if ($self->{'cover_image'}) {
+        if (defined $self->{'file_blocks'}->{$filename} && $self->{'file_blocks'}->{$filename} == 1){
+        $self->{'num_blocked'} ++;
+        return (0,undef); # blocked
+        }
+    }
+    }
     if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
     return (undef,undef); # can't recognise
@@ -885 +884 @@
 sub process {
     my $self = shift (@_);
-    my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj) = @_;
+    my ($textref, $pluginfo, $base_dir, $file, $metadata, $doc_obj, $gli) = @_;
 
     gsprintf(STDERR, "BasPlug::process {common.must_be_implemented}\n") && die "\n";