Changeset 24431 for main/trunk/greenstone2/perllib

Timestamp:

2011-08-19T17:04:41+12:00 (13 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed HTMLPlugin so that empty keywords and subject values as generated when converting PDFs to HTML don't get entered into ex.Meta anymore as escaped quoted Keywords and Subject. Added in John Rose's request that PDFPlugin automatically extract Title, Author, Subject and Keywords metadata fields and store them as ex.Metadata.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• HTMLPlugin.pm (modified) (1 diff)
• PDFPlugin.pm (modified) (1 diff)

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

@@ -1256 +1256 @@
     $value=$2;
 
-    if (! $value) {
-        $metatag =~ m/(?:name|http-equiv)\s*=\s*([^\s\>]+)/is;
-        $value=$1;
-    }
-    if (!defined $value) {
-        print $outhandle "HTMLPlugin: can't find VALUE in \"$metatag\"\n";
+    # The following code assigns the metaname to value if value is
+    # empty. Why would we do this?
+    #if (! $value) {
+    #    $metatag =~ m/(?:name|http-equiv)\s*=\s*([^\s\>]+)/is;
+    #    $value=$1;
+    #}
+    if (!defined $value || $value eq "") {
+        print $outhandle "HTMLPlugin: can't find VALUE in <meta $metatag >\n" if ($self->{'verbosity'} > 2);
         next;
     }

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

@@ -73 +73 @@
        'desc' => "{HTMLPlugin.metadata_fields}",
        'type' => "string",
-       'deft' => "" },
+       'deft' => "Title,Author,Subject,Keywords" },
       { 'name' => "metadata_field_separator",
     'desc' => "{HTMLPlugin.metadata_field_separator}",