Changeset 18402 for gsdl

Timestamp:

2009-01-16T13:39:45+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fixed inconsistent and incorrect escaping of square brackets in metadata values, and also tidied up some ghastly code while I was there.

File:

• gsdl/trunk/perllib/plugins/MARCPlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/MARCPlugin.pm

@@ -334 +334 @@
     {
     my $gsdl_field = $metadata_mapping->{$marc_field};
-    my $meta_value = undef;
     
     # have we got a subfield?
@@ -343 +342 @@
     }
     if (defined $subfield) {
-        $meta_value = $marc->subfield($marc_field, $subfield);
+        my $meta_value = $marc->subfield($marc_field, $subfield);
         if (defined $meta_value) {
-        ## escape [ and ]
-        $meta_value =~ s/\[/\\\[/g;
-        $meta_value =~ s/\]/\\\]/g;
+        # Square brackets in metadata values need to be escaped so they don't confuse Greenstone/GLI
+        $meta_value =~ s/\[/&\#091;/g;
+        $meta_value =~ s/\]/&\#093;/g;
         my $metavalue_str = $self->to_utf8($encoding, $meta_value);
         $doc_obj->add_utf8_metadata ($section, $gsdl_field, $metavalue_str);
         }
-    } else {
-        
-        my @metavalues = $marc->field($marc_field);
-        
-        if (scalar(@metavalues)>0)
+    }
+    else
+    {
+        foreach my $meta_value_obj ($marc->field($marc_field))
         {
-        my $metavalue = undef;
-        foreach $metavalue ( @metavalues )
-        {
-            my $metavalue_str = $self->to_utf8($encoding,$metavalue->as_string());
-            $doc_obj->add_utf8_metadata ($section, $gsdl_field, $metavalue_str);
-        }
+        my $meta_value = $meta_value_obj->as_string();
+
+        # Square brackets in metadata values need to be escaped so they don't confuse Greenstone/GLI
+        $meta_value =~ s/\[/&\#091;/g;
+        $meta_value =~ s/\]/&\#093;/g;
+        my $metavalue_str = $self->to_utf8($encoding, $meta_value);
+        $doc_obj->add_utf8_metadata ($section, $gsdl_field, $metavalue_str);
         }
     }