Changeset 16392 for gsdl/trunk/perllib/plugins/ZIPPlugin.pm

Timestamp:

2008-07-14T14:57:38+12:00 (16 years ago)

Author:

kjdon

Message:

global block pass: read_block is no more, use can_process_this_file to see whether a file is for us or not. extra arg (block_hash) to read, read_into_doc_obj, metadata_read etc

File:

• gsdl/trunk/perllib/plugins/ZIPPlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/ZIPPlugin.pm

@@ -101 +101 @@
 sub read {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
     my $outhandle = $self->{'outhandle'};
 
-    # 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));
+    # can we process this file??
+    my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+    return undef unless $self->can_process_this_file($filename_full_path);
     
-    my ($file_only) = $file =~ /([^\\\/]*)$/;
     my $tmpdir = &util::get_tmp_filename ();
     &util::mk_all_dir ($tmpdir);
     
-    print $outhandle "ZIPPlugin: extracting $file_only to $tmpdir\n"
+    print $outhandle "ZIPPlugin: extracting $filename_no_path to $tmpdir\n"
     if $self->{'verbosity'} > 1;
     
@@ -118 +117 @@
     my $cwd = cwd();
     chdir ($tmpdir) || die "Unable to change to $tmpdir";
-    &util::cp ($filename, $tmpdir);
+    &util::cp ($filename_full_path, $tmpdir);
     
     if ($file =~ /\.bz$/i) {
-    $self->bunzip ($file_only);
+    $self->bunzip ($filename_no_path);
     } elsif ($file =~ /\.bz2$/i) {
-    $self->bunzip2 ($file_only);
+    $self->bunzip2 ($filename_no_path);
     } elsif ($file =~ /\.(zip|jar)$/i) {
-    $self->unzip ($file_only);
+    $self->unzip ($filename_no_path);
     } elsif ($file =~ /\.tar$/i) {
-    $self->untar ($file_only);
+    $self->untar ($filename_no_path);
     } else {
-    $self->gunzip ($file_only);
+    $self->gunzip ($filename_no_path);
     }
     
     chdir ($cwd) || die "Unable to change back to $cwd";
     
-    my $numdocs = &plugin::read ($pluginfo, "", $tmpdir, $metadata, $processor, $maxdocs, $total_count, $gli);
+    my $numdocs = &plugin::read ($pluginfo, "", $tmpdir, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli);
     &util::rm_r ($tmpdir);