Changeset 10218 for trunk/gsdl/perllib/plugins/RecPlug.pm

Timestamp:

2005-07-06T15:27:45+12:00 (19 years ago)

Author:

kjdon

Message:

Jeffrey's new parsing modifications, committed approx 6 July, 15.16

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (4 diffs)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -131 +131 @@
 
 my ($self);
+
 sub new {
-    my $class = shift (@_);
-    
-    # $self is global for use within subroutines called by XML::Parser
-    $self = new BasPlug ($class, @_);
-    
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
-
-    if (!parsargv::parse(\@_,
-             q^use_metadata_files^, \$self->{'use_metadata_files'},
-             q^recheck_directories^, \$self->{'recheck_directories'},
-             "allow_extra_options")) {
-    print STDERR "\nRecPlug uses an incorrect option.\n";
-    print STDERR "Check your collect.cfg configuration file.\n\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-    
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    $self = (defined $hashArgOptLists)? new BasPlug($pluginlist,$inputargs,$hashArgOptLists): new BasPlug($pluginlist,$inputargs);
     if ($self->{'use_metadata_files'}) {
     # create XML::Parser object for parsing metadata.xml files
@@ -157 +147 @@
                             'Doctype' => \&Doctype
                             });
+
     $self->{'parser'} = $parser;
     $self->{'in_filename'} = 0;
     }
-
+    
     $self->{'subdir_extrametakeys'} = {};
 
@@ -425 +416 @@
     # Next add metadata read in XML files (if it is supplied)
     if ($additionalmetadata == 1) {
+        
         my ($filespec, $mdref);
         foreach $filespec (@extrametakeys) {
@@ -498 +490 @@
 sub StartTag {
     my ($expat, $element) = @_;
-    
+
     if ($element eq "FileSet") {
     $self->{'saved_targets'} = [];