Changeset 21367 for main/trunk

Timestamp:

2009-12-16T14:43:55+13:00 (14 years ago)

Author:

kjdon

Message:

escape [] in metadata, otherwise it will screw up greenstone. instead of ignoring all dc.description metadata, only ignore dc.description.provenance as this is the only one used internally by DSpace. Patch thanks to
Pongtawat Chippimolchai
KIDS-D Project
Asian Institute of Technology

File:

• main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugins/DSpacePlugin.pm

@@ -365 +365 @@
     my $metaname = $_{'element'};
     my $qualifier = $_{'qualifier'}||"";
-    if ($metaname ne "description") {
+    if ($metaname ne "description" || $qualifier ne "provenance") {
         $metaname .= "^$qualifier" if ($qualifier ne "none" && $qualifier ne "");
         $self->{'metaname'} = "dc.\u$metaname";
@@ -384 +384 @@
     # $_ == Metadata content
     my $mname = $self->{'metaname'};
+    my $mvalue = prepareMetadataValue($_);
     if (defined $self->{'saved_metadata'}->{$mname}) {
         # accumulate - add value to existing value(s)
         if (ref ($self->{'saved_metadata'}->{$mname}) eq "ARRAY") {
-        push (@{$self->{'saved_metadata'}->{$mname}}, $_);
+        push (@{$self->{'saved_metadata'}->{$mname}}, $mvalue);
         } else {
         $self->{'saved_metadata'}->{$mname} = 
-            [$self->{'saved_metadata'}->{$mname}, $_];
+            [$self->{'saved_metadata'}->{$mname}, $mvalue];
         }
     } else {
         # accumulate - add value into (currently empty) array
-        $self->{'saved_metadata'}->{$mname} = [$_];
-    }
-
-    }
-}
-
+        $self->{'saved_metadata'}->{$mname} = [$mvalue];
+    }
+
+    }
+}
+
+# Prepare DSpace metadata for using with Greenstone.
+# Some value must be escaped.
+sub prepareMetadataValue {
+    my ($value) = @_;
+    
+    $value =~ s/\[/[/g;
+    $value =~ s/\]/]/g;
+    
+    return $value;
+ }
 # This Char function overrides the one in XML::Parser::Stream to overcome a
 # problem where $expat->{Text} is treated as the return value, slowing