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

gsdl/trunk/perllib/plugins/LOMPlugin.pm

@@ -106 +106 @@
 
 
-
+sub can_process_this_file {
+    my $self = shift(@_);
+    my ($filename) = @_;
+
+    if ($self->SUPER::can_process_this_file($filename) && $self->check_doctype($filename)) {
+    return 1; # its a file for us
+    }
+    return 0;
+}
 
 sub metadata_read {
     my $self = shift (@_);
-    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
 
     my $outhandle = $self->{'outhandle'};
 
-    my $filename = $file;
-    $filename = &util::filename_cat ($base_dir, $file) if $base_dir =~ /\w/;
-    
-    if ($filename !~ /$self->{'process_exp'}/ || !-f $filename) {
-    return undef; # can't recognise
-    }
-    if (!$self->check_doctype($filename)) {
-    # this file is not for us
-    return undef;
-    }
+    # 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);
 
     $file =~ s/^[\/\\]+//; # $file often begins with / so we'll tidy it up
@@ -130 +131 @@
     if $self->{'verbosity'} > 1;
 
-    my ($dir,$tail) = $filename =~ /^(.*?)([^\/\\]*)$/;
+    my ($dir,$tail) = $filename_full_path =~ /^(.*?)([^\/\\]*)$/;
     $self->{'output_dir'} = $dir;
 
     eval {
-    $self->{'parser'}->parsefile($filename);
+    $self->{'parser'}->parsefile($filename_full_path);
     };
     
     if ($@) {
-    print $outhandle "LOMPlugin: skipping $filename as not conformant to LOM syntax\n" if ($self->{'verbosity'} > 1);
+    print $outhandle "LOMPlugin: skipping $filename_full_path as not conformant to LOM syntax\n" if ($self->{'verbosity'} > 1);
     print $outhandle "\n Perl Error:\n $@\n" if ($self->{'verbosity'}>2);
     return 0;
@@ -212 +213 @@
 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'};
@@ -218 +219 @@
     return 0 if (defined $self->{'extra_blocks'}->{$file});
 
-    # need to check whether this file is for us
-    my ($block_status,$filename) = $self->read_block(@_);    
-    return $block_status if ((!defined $block_status) || ($block_status==0));
-    if (!$self->check_doctype($filename)) {
-    # this file is not for us
-    return undef;
-    }
+    # 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);
 
     $self->{'metadata_table'} = $metadata;