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

trunk/gsdl/perllib/plugins/ZIPPlug.pm

@@ -82 +82 @@
     my $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
 
-    # BasPlug is explicitly set not to set process_exp if recursive plugin
-    # Not sure of this reasoning.  Want it to be set in ZIPPlug, so explicitly
-    # pass it in as default value
-    
-    ## do we need this???? --kjdon
-    if (!$self->{'process_exp'}) {
-    $self->{'process_exp'} = get_default_process_exp();
-    }
-
     return bless $self, $class;
 }
@@ -113 +104 @@
     my $outhandle = $self->{'outhandle'};
 
-    if ($file =~ /$self->{'process_exp'}/) {
-
-    my $filename = $file;
-    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
-    if (!-e $filename) {
-        print $outhandle "ZIPPLug: WARNING: $filename does not exist\n";
-        return undef;
-    }
+    # check process_exp, block_exp, associate_ext etc
+    my ($block_status,$filename) = $self->read_block(@_);    
+    return $block_status if ((!defined $block_status) || ($block_status==0));
     
-    my ($file_only) = $file =~ /([^\\\/]*)$/;
-    my $tmpdir = &util::get_tmp_filename ();
-    &util::mk_all_dir ($tmpdir);
-
-    print $outhandle "ZIPPlug: extracting $file_only to $tmpdir\n"
-        if $self->{'verbosity'} > 1;
-
-    # save current working directory
-    my $cwd = cwd();
-    chdir ($tmpdir) || die "Unable to change to $tmpdir";
-    &util::cp ($filename, $tmpdir);
-    
-    if ($file =~ /\.bz$/i) {
-        $self->bunzip ($file_only);
-    } elsif ($file =~ /\.bz2$/i) {
-        $self->bunzip2 ($file_only);
-    } elsif ($file =~ /\.(zip|jar)$/i) {
-        $self->unzip ($file_only);
-    } elsif ($file =~ /\.tar$/i) {
-        $self->untar ($file_only);
-    } else {
-        $self->gunzip ($file_only);
-    }
-
-    chdir ($cwd) || die "Unable to change back to $cwd";
-
-    my $numdocs = &plugin::read ($pluginfo, "", $tmpdir, $metadata, $processor, $maxdocs, $total_count, $gli);
-    &util::rm_r ($tmpdir);
-
-    $self->{'num_archives'} ++;
-
-    return $numdocs;
-
+    my ($file_only) = $file =~ /([^\\\/]*)$/;
+    my $tmpdir = &util::get_tmp_filename ();
+    &util::mk_all_dir ($tmpdir);
+    
+    print $outhandle "ZIPPlug: extracting $file_only to $tmpdir\n"
+    if $self->{'verbosity'} > 1;
+    
+    # save current working directory
+    my $cwd = cwd();
+    chdir ($tmpdir) || die "Unable to change to $tmpdir";
+    &util::cp ($filename, $tmpdir);
+    
+    if ($file =~ /\.bz$/i) {
+    $self->bunzip ($file_only);
+    } elsif ($file =~ /\.bz2$/i) {
+    $self->bunzip2 ($file_only);
+    } elsif ($file =~ /\.(zip|jar)$/i) {
+    $self->unzip ($file_only);
+    } elsif ($file =~ /\.tar$/i) {
+    $self->untar ($file_only);
     } else {
-    return undef;
+    $self->gunzip ($file_only);
     }
+    
+    chdir ($cwd) || die "Unable to change back to $cwd";
+    
+    my $numdocs = &plugin::read ($pluginfo, "", $tmpdir, $metadata, $processor, $maxdocs, $total_count, $gli);
+    &util::rm_r ($tmpdir);
+    
+    $self->{'num_archives'} ++;
+    
+    return $numdocs;
+    
 }