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

trunk/gsdl/perllib/plugins/PagedImgPlug.pm

@@ -539 +539 @@
     my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
     my $outhandle   = $self->{'outhandle'};
-    my $smart_block = $self->{'smart_block'};
-    
-    my $filename = &util::filename_cat($base_dir, $file);
-    
-    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;
-    }
+    
+    #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));
     
     print $outhandle "PagedImgPlug processing \"$filename\"\n"
@@ -731 +712 @@
     # assign pagenum as  what??
     my $pagenum = $_{'pagenum'}; #TODO!!
-    $doc_obj->set_utf8_metadata_element($self->{'current_section'}, 'PageNum', $pagenum);
+    if (defined $pagenum) {
+        $doc_obj->set_utf8_metadata_element($self->{'current_section'}, 'PageNum', $pagenum);
+    }
     my ($imgfile) = $_{'imgfile'};
     if (defined $imgfile) {
@@ -832 +815 @@
     $doc_obj->set_OIDtype ($processor->{'OIDtype'});
     my $topsection = $doc_obj->get_top_section();
+    $doc_obj->add_utf8_metadata($topsection, "Plugin", "$self->{'plugin_type'}");
+    $doc_obj->add_metadata($topsection, "FileFormat", "PagedImg");
 
     if ($self->{'documenttype'} eq 'paged') {
@@ -849 +834 @@
     next unless $line =~ /\w/;
     chomp $line;
+    next if $line =~ /^#/; # ignore comment lines
     if ($line =~ /^<([^>]*)>\s*(.*?)\s*$/) {
         $doc_obj->set_utf8_metadata_element ($topsection, $1, $2);