Changeset 14949 for gsdl

Timestamp:

2008-01-31T16:38:34+13:00 (16 years ago)

Author:

davidb

Message:

Tweak to parsing of OAI metadata to XML tags within a metadata field don't trip it up

File:

• gsdl/trunk/perllib/plugins/OAIPlug.pm (modified) (3 diffs)

gsdl/trunk/perllib/plugins/OAIPlug.pm

@@ -304 +304 @@
     my ($metaname, $metavalue_utf8) = @_;
 
-    $metavalue_utf8 =~ s/hdl\.handle\.net/mcgonagall.cs.waikato.ac.nz:8080\/dspace\/handle/;
+###    $metavalue_utf8 =~ s/hdl\.handle\.net/mcgonagall.cs.waikato.ac.nz:8080\/dspace\/handle/;
     $metavalue_utf8 = &util::hyperlink_text($metavalue_utf8);
 
@@ -415 +415 @@
     }
 
-    while ($inner_metadata_text =~ m/<([^ >]+).*?>(.*?)<\/(.*?)>(.*)/s)
+    while ($inner_metadata_text =~ m/<([^ >]+).*?>(.*?)<\/\1>(.*)/s)
     {
         # if URL given for document as identifier metadata, store it ...
@@ -422 +422 @@
         my $metaname = $1;
         my $metavalue = $2;
-        $inner_metadata_text = $4;
-        
+        $inner_metadata_text = $3;
+
+#       print STDERR "*** metaname = $metaname\n";
+#       print STDERR "*** metavalue = $metavalue\n";
+
         # $metaname =~ s/^(dc:)?(.)/\u$2/; # strip of optional prefix and uppercase first letter
         $metaname =~ s/:/\./;