Changeset 21801 for main

Timestamp:

2010-03-17T13:01:20+13:00 (14 years ago)

Author:

kjdon

Message:

extended HTMLPlugin's metadata_field_separator option to Word and StructuredHTML plugins

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• StructuredHTMLPlugin.pm (modified) (2 diffs)
• WordPlugin.pm (modified) (2 diffs)

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

@@ -365 +365 @@
     return if (!defined $textref);
 
+    my $separator = $self->{'metadata_field_separator'};
+    if ($separator eq "") {
+    undef $separator;
+    }
     # metadata fields to extract/save. 'key' is the (lowercase) name of the
     # html meta, 'value' is the metadata name for greenstone to use
@@ -395 +399 @@
         #print $outhandle " extracted \"$tag\" metadata \"$value\"\n" 
         #    if ($self->{'verbosity'} > 2);
-        $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), $tag, $value);
+        if (defined $separator) {
+            my @values = split($separator, $value);
+            foreach my $v (@values) {
+            $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), $tag, $v) if $v =~ /\S/;
+            }
+        }
+        else {
+            $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), $tag, $value);
+        }
         }
     }

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

@@ -65 +65 @@
              'type' => "string",
              'deft' => "Title" },
+               { 'name' => "metadata_field_separator",
+             'desc' => "{HTMLPlugin.metadata_field_separator}",
+             'type' => "string",
+             'deft' => "" },
                { 'name' => "level1_header",
              'desc' => "{StructuredHTMLPlugin.level1_header}",
@@ -139 +143 @@
         push (@$structhtml_options, "-level3_header", $self->{'level3_header'}) if $self->{'level3_header'};
         push (@$structhtml_options, "-metadata_fields", $self->{'metadata_fields'}) if $self->{'metadata_fields'};
+        push (@$structhtml_options, "-metadata_field_separator", $self->{'metadata_field_separator'}) if $self->{'metadata_field_separator'};
     }
     }