Changeset 27141 for main

Timestamp:

2013-03-28T11:10:39+13:00 (11 years ago)

Author:

kjdon

Message:

fixed extract_metadata so that it will get all ocurrences of a subfield, not just the first one. NOTE, haven't done the same for extract_ascii_metadata

File:

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

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

@@ -333 +333 @@
 }
 
-
 sub extract_metadata
 {
@@ -357 +356 @@
         $subfield = $2;
     }
-    if (defined $subfield) {
-        my $meta_value = $marc->subfield($marc_field, $subfield);
+
+    foreach my $meta_value_obj ($marc->field($marc_field)) {
+        my $meta_value;
+        if (defined($subfield)) {
+        $meta_value = $meta_value_obj->subfield($subfield);
+        } else {
+        $meta_value = $meta_value_obj->as_string();
+        }
         if (defined $meta_value) {
-        # 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
-    {
-        foreach my $meta_value_obj ($marc->field($marc_field))
-        {
-        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;