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

trunk/gsdl/perllib/plugins/MARCPlug.pm

@@ -69 +69 @@
 
 sub new {
-    my $class = shift (@_);
-    my $self = new SplitPlug ($class, @_);
-    $self->{'plugin_type'} = "MARCPlug";
-    my $metadata_mapping;
-
-    if (!parsargv::parse(\@_, 
-             q^metadata_mapping/.*/marctodc.txt^, \$metadata_mapping,
-             "allow_extra_options")) {
-
-    print STDERR "\nIncorrect options passed to MARCPlug, check your collect.cfg configuration file\n";
-    $self->print_txt_usage("");  # Use default resource bundle
-    die "\n";
-    }
-
-
-    $self->{'mm_file'} = $metadata_mapping; # relative to etc dir
-
-    # 14-05-02 To allow for proper inheritance of arguments - John Thompson
-    my $option_list = $self->{'option_list'};
-    push( @{$option_list}, $options );
+    my ($class) = shift (@_);
+    my ($pluginlist,$inputargs,$hashArgOptLists) = @_;
+    push(@$pluginlist, $class);
+
+    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
+    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
+
+    my $self = (defined $hashArgOptLists)? new SplitPlug($pluginlist,$inputargs,$hashArgOptLists): new SplitPlug($pluginlist,$inputargs);
 
     return bless $self, $class;
@@ -101 +89 @@
     # read in the metadata mapping file
     my $mm_file =
-    &util::filename_cat( $ENV{'GSDLHOME'}, "etc", $self->{'mm_file'} );
+    &util::filename_cat( $ENV{'GSDLHOME'}, "etc", $self->{'metadata_mapping'} );
 
     if (!-e $mm_file)
@@ -107 +95 @@
 
     my $msg = "MARCPlug ERROR: Can't locate mapping file \"" .
-        $self->{'mm_file'} . "\".\n    This file should be at $mm_file\n" .
+        $self->{'metadata_mapping'} . "\".\n    This file should be at $mm_file\n" .
         "    No marc files can be processed.\n";
 
     print $outhandle $msg;
     print $failhandle $msg;
-    $self->{'mm_file'} = undef;
+    $self->{'metadata_mapping'} = undef;
     # We pick up the error in process() if there is no $mm_file
     # If we exit here, then pluginfo.pl will exit too!
@@ -222 +210 @@
     my $filename = &util::filename_cat($base_dir, $file);
 
-    if (! defined($self->{'mm_file'}))
+    if (! defined($self->{'metadata_mapping'}))
     {
     print $outhandle "MARCPlug: no metadata file! Can't process $file\n";