Changeset 2326

Timestamp:

2001-04-19T22:13:12+12:00 (23 years ago)

Author:

sjboddie

Message:

fixed a small bug in the new XML gml code that caused metadata tags
beginning with a '/' (like </srclink>) to be a problem

Location:

trunk/gsdl/perllib

Files:

• doc.pm (modified) (1 diff)
• plugins/GMLPlug.pm (modified) (2 diffs)

trunk/gsdl/perllib/doc.pm

@@ -206 +206 @@
     foreach $data (@{$section_ptr->{'metadata'}}) {
     my $tag_name = $data->[0];
+
+    # a tagname beginning with '/' (like </srclink>) will cause problems
+    # so we'll escape any leading '/'
+    $tag_name =~ s/^\//&\#47;/; 
+
     my $tag_value = &_escape_text($data->[1]);
 

trunk/gsdl/perllib/plugins/GMLPlug.pm

@@ -138 +138 @@
         if ($text =~ m/^\s*<metadata>/)
         {
-            my $metadata;
+            my ($metadata, $tagname, $tagvalue);
             ($metadata,$text) 
             = ($text =~ m/\s*<metadata>\s*(<.*)\s*<\/metadata>(.*)$/s);
@@ -144 +144 @@
                && ($metadata =~ s/<(.*?)>(.*?)<\/.*?>//s))
             {
-            $doc_obj->add_utf8_metadata($section, $1, &GMLPlug::_unescape_text($2)) 
-                if (defined $1 and defined $2);
+            if (defined $1 && defined $2) 
+            {
+                $tagname = $1;
+                $tagvalue = $2;
+                
+                # if tagname begins with '/' it will be escaped
+                $tagname =~ s/^&\#47;/\//;
+                
+                $doc_obj->add_utf8_metadata($section, $tagname, &GMLPlug::_unescape_text($tagvalue)); 
+            }
             }
         }