Changeset 17289

Timestamp:

2008-09-15T15:25:14+12:00 (16 years ago)

Author:

kjdon

Message:

moved the actual parsing from read into parse_file so other plugins can do parsing without calling read(). Note, still have testing to do for this, but am going home now

File:

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

gsdl/trunk/perllib/plugins/ReadXMLFile.pm

@@ -213 +213 @@
     $self->{'filename'} = $filename_full_path;
     $self->{'processor'} = $processor;
+    # this contains metadata passed in from running metadata_read with other plugins (eg from MetadataXMLPlugin)
+    # we are also using it to store up any metadata found during parsing the XML, so that it can be added to the doc obj.
     $self->{'metadata'} = $metadata;
 
+    if ($self->parsefile($filename_full_path)) {
+    return 1; # processed the file
+    }
+    return -1;
+}
+
+
+sub parse_file {
+    my $self = shift (@_);
+    my ($filename_full_path, $file, $gli) = @_;
     eval {
     my $xslt = $self->{'xslt'};
@@ -252 +264 @@
     return -1; # error during processing
     }
-
-    
-    return 1; # processed the file
-}
-
+    return 1; # parsing was successful
+}
 
 sub get_default_process_exp {