Changeset 863

Timestamp:

2000-01-25T10:48:29+13:00 (24 years ago)

Author:

sjboddie

Message:

fixed a couple of bugs that I introduced when including Davids stuff

File:

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

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -136 +136 @@
         # create the section (unless this is the first section)
         if ($firstsection) {
-            $firstsection = 0;
+            $firstsection = 0;
 #           $tags =~ /gsdlsourcefilename\s*=\s*(?:\"([^\"]*)\")/o;
 #           $src_filename = $2 || $3;
@@ -152 +152 @@
         
         # add the tags
-        while ((defined $tags) && ($tags =~ s/^\s*(\w+)=\"([^\"]*)\"//o)) {
+        while ((defined $tags) && ($tags =~ s/^\s*(\S+)=\"([^\"]*)\"//o)) {
             $doc_obj->add_utf8_metadata($section, $1, &GMLPlug::_unescape_text($2)) 
             if (defined $1 and defined $2);
+
         }
         
@@ -164 +165 @@
         $gml = shift(@gml_sections); # get next bit of data
         last unless defined $gml;
+        last if $section eq ""; # back to top level again (more than one document in gml file)
         $section = $doc_obj->get_parent_section ($section);
-        last if $section eq ""; # back to top level again (more than one document in gml file)
     }
 
@@ -179 +180 @@
     $doc_obj->delete_metadata($doc_obj->get_top_section(), "gsdlassocfile");
     
-    # add metadata
-    foreach $field (keys(%$metadata)) {
-        # $metadata->{$field} may be an array reference
-        if (ref ($metadata->{$field}) eq "ARRAY") {
-        map { 
-            $doc_obj->add_metadata ($doc_obj->get_top_section(), $field, $_); 
-        } @{$metadata->{$field}};
-        } else {
-        $doc_obj->add_metadata ($doc_obj->get_top_section(), $field, $metadata->{$field}); 
-        }
-    }
+    # add metadata passed in from elsewhere
+    $self->extra_metadata ($doc_obj, $doc_obj->get_top_section(), $metadata);
     
     # assume the document has an OID