Changeset 15872 for gsdl/trunk/perllib/plugins/MARCXMLPlugin.pm

Timestamp:

2008-06-05T09:29:32+12:00 (16 years ago)

Author:

kjdon

Message:

plugin overhaul: plugins renamed to xxPlugin, and in some cases the names are made more sensible. They now use the new base plugins. Hopefully we have better code reuse. Some of the plugins still need work done as I didn't want to spend another month doing this before committing it. Alos, I haven't really tested anything yet...

File:

• gsdl/trunk/perllib/plugins/MARCXMLPlugin.pm (modified) (8 diffs)

gsdl/trunk/perllib/plugins/MARCXMLPlugin.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# MARCXMLPlug.pm
+# MARCXMLPlugin.pm
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the 
@@ -28 +28 @@
 # well-formedness).
 
-package MARCXMLPlug;
-
-use XMLPlug;
+package MARCXMLPlugin;
+
+use ReadXMLFile;
 
 use strict;
@@ -36 +36 @@
 
 sub BEGIN {
-    @MARCXMLPlug::ISA = ('XMLPlug');
+    @MARCXMLPlugin::ISA = ('ReadXMLFile');
 }
 
 my $arguments = [{'name' => "metadata_mapping_file",
-          'desc' => "{MARCXMLPlug.metadata_mapping_file}",
+          'desc' => "{MARCXMLPlugin.metadata_mapping_file}",
           'type' => "string",
           'deft' => "marctodc.txt",
           'reqd' => "no" }];
 
-my $options = { 'name'     => "MARCXMLPlug",
-        'desc'     => "{MARCXMLPlug.desc}",
+my $options = { 'name'     => "MARCXMLPlugin",
+        'desc'     => "{MARCXMLPlugin.desc}",
         'abstract' => "no",
         'inherits' => "yes",
@@ -57 +57 @@
     push(@$pluginlist, $class);
 
-    if(defined $arguments){ push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});}
-    if(defined $options) { push(@{$hashArgOptLists->{"OptList"}},$options)};
-    
-    my $self = new XMLPlug($pluginlist, $inputargs, $hashArgOptLists);
+    push(@{$hashArgOptLists->{"ArgList"}},@{$arguments});
+    push(@{$hashArgOptLists->{"OptList"}},$options);
+    
+    my $self = new ReadXMLFile($pluginlist, $inputargs, $hashArgOptLists);
     
     $self->{'content'} = "";
@@ -222 +222 @@
     if (scalar(@$mm_files)==0)
     {
-    my $msg = "MARCXMLPlug ERROR: Can't locate mapping file \"" .
+    my $msg = "MARCXMLPlugin ERROR: Can't locate mapping file \"" .
         $self->{'metadata_mapping_file'} . "\".\n " .
         "    No marc files can be processed.\n";
@@ -269 +269 @@
     $self->{'indent'} = 0;
     my $outhandle = $self->{'outhandle'};
-    print $outhandle "MARCXMLPlug: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
-    print STDERR "<Processing n='$self->{'file'}' p='MARCXMLPlug'>\n" if $self->{'gli'};
+    print $outhandle "MARCXMLPlugin: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
+    print STDERR "<Processing n='$self->{'file'}' p='MARCXMLPlugin'>\n" if $self->{'gli'};
  
 }
@@ -310 +310 @@
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);
     my ($filemeta) = $file =~ /([^\\\/]+)$/;
-    $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Source", &ghtml::dmsafe($filemeta));
+    $self->set_Source_metadata($doc_obj, $filemeta, $encoding);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "SourceSegment", "$self->{'record_count'}");
         if ($self->{'cover_image'}) {
@@ -319 +319 @@
 
     my $outhandle = $self->{'outhandle'};
-    print $outhandle "Record $self->{'record_count'} - MARCXMLPlug: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
+    print $outhandle "Record $self->{'record_count'} - MARCXMLPlugin: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
 
         $self->{'record_count'}++;