Changeset 7900

Timestamp:

2004-08-06T16:23:22+12:00 (20 years ago)

Author:

chi

Message:

Some minor changes in preparation for the introduction of METSPlug.

Location:

trunk/gsdl/perllib/plugins

Files:

• GAPlug.pm (modified) (6 diffs)
• XMLPlug.pm (modified) (5 diffs)

trunk/gsdl/perllib/plugins/GAPlug.pm

@@ -39 +39 @@
 }
 
+
+sub get_default_process_exp {
+    my $self = shift (@_);
+
+    return q^(?i)doc\.xml$^;
+}
+
 my $options = { 'name'     => "GAPlug",
         'desc'     => "{GAPlug.desc}",
@@ -57 +64 @@
     $self->{'metadata_value'} = "";
     $self->{'content'} = "";
-
+   
     return bless $self, $class;
 }
@@ -69 +76 @@
 sub xml_doctype {
     my $self = shift(@_);
+
     my ($expat, $name, $sysid, $pubid, $internal) = @_;
 
@@ -76 +84 @@
 
     my $outhandle = $self->{'outhandle'};
-    print $outhandle "GAPLug: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
+    print $outhandle "GAPlug: processing $self->{'file'}\n" if $self->{'verbosity'} > 1;
 }
 
@@ -88 +96 @@
     if ($self->{'section_level'} == 0) {
         $self->open_document();
-    } else {
+        } else {
         my $doc_obj = $self->{'doc_obj'};
         $self->{'section'} = 
         $doc_obj->insert_section($doc_obj->get_end_child($self->{'section'}));
     }
+    
     $self->{'section_level'} ++;
     }
@@ -110 +119 @@
     }
     elsif ($element eq "Metadata") {
-    $self->{'doc_obj'}->add_utf8_metadata($self->{'section'}, $self->{'metadata_name'},
-                          $self->{'metadata_value'});
+    $self->{'doc_obj'}->add_utf8_metadata($self->{'section'}, $self->{'metadata_name'},$self->{'metadata_value'});
     $self->{'metadata_name'} = "";
     $self->{'metadata_value'} = "";

trunk/gsdl/perllib/plugins/XMLPlug.pm

@@ -67 +67 @@
                         'Doctype' => \&Doctype,
                         'Default' => \&Default
-                        }
-                 );
+                        });
+
+    
+                
     $self->{'parser'} = $parser;
 
@@ -100 +102 @@
     $self->{'parser'}->parsefile($filename);
     };
+  
     if ($@) {
 
@@ -109 +112 @@
     # we'll just continue quietly
 
+    ## print STDERR "**** Error is: $@\n";
+
     my ($msg) = $@ =~ /Carp::croak\(\'(.*?)\'\)/;
     if (defined $msg) { 
@@ -115 +120 @@
         print $outhandle "$plugin_name failed to process $file ($msg)\n";
     }
+
     # reset ourself for the next document
     $self->{'section_level'}=0;
     return -1; # error during processing
     }
-
     return 1; # processed the file
 }
@@ -250 +255 @@
 1;
 
+
+
+