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

gsdl/trunk/perllib/plugins/ReadXMLFile.pm

@@ -157 +157 @@
     return $transformed_xml;
 
+}
+
+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;
 }
 
@@ -188 +198 @@
 }
 
-# because we are not just using process_exp to determine whether to process or not, we need to implement this too, so that a file can be passed down if we are not actually processing it
-sub metadata_read {
-    my $self = shift (@_);
-    
-    my ($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli) = @_;
- 
-    my $result = $self->SUPER::metadata_read($pluginfo, $base_dir, $file, $metadata, $extrametakeys, $extrametadata, $processor, $maxdocs, $gli);
-
-    if (defined $result) {
-    # we think we are processing this, but check that we actually are
-    my ($filename_full_path, $filename_no_path) = $self->get_full_filenames($base_dir, $file);
-
-    if ($self->check_doctype($filename_full_path)) {
-        return $result;
-    }
-    }
-    return undef;
-}
 
 # we need to implement read cos we are not just using process_exp to determine
@@ -212 +204 @@
     my $self = shift (@_);  
   
-    my ($pluginfo, $base_dir, $file, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
-
-    # Make sure we're processing the correct file, do blocking etc
-    my ($block_status,$filename_full_path) = $self->read_block(@_);    
-    return $block_status if ((!defined $block_status) || ($block_status==0));
-
-    ## check the doctype to see whether we really want to process the file
-    if (!$self->check_doctype($filename_full_path)) {
-    # this file is not for us
-    return undef;
-    }
-
+    my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $processor, $maxdocs, $total_count, $gli) = @_;
+
+    # 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
     $self->{'base_dir'} = $base_dir;