Changeset 21800 for main/trunk

Timestamp:

2010-03-17T12:33:06+13:00 (14 years ago)

Author:

kjdon

Message:

added a new option, metadata_field_separator, which specifies what to split on for multi-valued metadata

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/HTMLPlugin.pm (modified) (3 diffs)
• plugins/PDFPlugin.pm (modified) (2 diffs)
• strings.properties (modified) (1 diff)

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

@@ -75 +75 @@
     'type' => "string",
     'deft' => "Title" },
+      { 'name' => "metadata_field_separator",
+    'desc' => "{HTMLPlugin.metadata_field_separator}",
+    'type' => "string",
+    'deft' => "" },
       { 'name' => "hunt_creator_metadata",
     'desc' => "{HTMLPlugin.hunt_creator_metadata}",
@@ -923 +927 @@
     return if (!defined $self->{'metadata_fields'});
 
+    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
@@ -1036 +1045 @@
     #    $tag = lc($tag);
     #}
-
-    $doc_obj->add_utf8_metadata($section, $tag, $value);
-
+    if (defined $separator) {
+        my @values = split($separator, $value);
+        foreach my $v (@values) {
+        $doc_obj->add_utf8_metadata($section, $tag, $v) if $v =~ /\S/;
+        }
+    }
+    else {
+        $doc_obj->add_utf8_metadata($section, $tag, $value);
+    }
     }
     

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

@@ -72 +72 @@
        'type' => "string",
        'deft' => "" },
+      { 'name' => "metadata_field_separator",
+    'desc' => "{HTMLPlugin.metadata_field_separator}",
+    'type' => "string",
+    'deft' => "" },
      { 'name' => "noimages",
        'desc' => "{PDFPlugin.noimages}",
@@ -174 +178 @@
     push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
     }
-    #push(@$html_options,"-metadata_fields","Title,GENERATOR,date,author<Creator>");
+    if (defined $self->{'metadata_field_separator'} && $self->{'metadata_field_separator'} =~ /\S/) {
+    push(@$html_options,"-metadata_field_separator",$self->{'metadata_field_separator'});
+    }
         
     if ($self->{'use_sections'} || $self->{'description_tags'}) {

main/trunk/greenstone2/perllib/strings.properties

@@ -923 +923 @@
 HTMLPlugin.metadata_fields:Comma separated list of metadata fields to attempt to extract. Capitalise this as you want the metadata capitalised in Greenstone, since the tag extraction is case insensitive. e.g. Title,Date. Use 'tag<tagname>' to have the contents of the first <tag> pair put in a metadata element called 'tagname'. e.g. Title,Date,Author<Creator>
 
+HTMLPlugin.metadata_field_separator:Separator character used in multi-valued metadata. Will split a metadata field value on this character, and add each item as individual metadata.
+
 HTMLPlugin.no_metadata:Don't attempt to extract any metadata from files.