Changeset 32290 for main/trunk/greenstone2/perllib/plugins

Timestamp:

2018-07-19T19:54:32+12:00 (6 years ago)

Author:

ak19

Message:

1. Making paged_pretty_html the default rather than pretty_html, since it's likely more users will want their converted PDF sectionalised. 2. Hopefully improved the display strings to make sense for users rather than for me.

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• PDFPlugin.pm (modified) (1 diff)
• PDFv2Plugin.pm (modified) (6 diffs)

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

@@ -165 +165 @@
     if ($self->{'use_realistic_book'}) {
     if ($self->{'convert_to'} ne "html") {
-        print STDERR "PDFs will be converted to HTML for realistic book functionality\n";
+        &gsprintf::gsprintf(STDERR, "PDFv2Plugin: {PDFPlugin.html_for_realistic_book}\n");
         $self->{'convert_to'} = "html";
     }

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

@@ -76 +76 @@
        'reqd' => "yes",
        'list' => $convert_to_list, 
-       'deft' => "pretty_html" },    
+       'deft' => "paged_pretty_html" },  
      { 'name' => "process_exp",
        'desc' => "{BaseImporter.process_exp}",
@@ -86 +86 @@
        'type' => "regexp",
        'deft' => &get_default_block_exp() },
-     { 'name' => "metadata_fields",
-       'desc' => "{HTMLPlugin.metadata_fields}",
-       'type' => "string",
-       'deft' => "Title,Author,Subject,Keywords" },
-     { 'name' => "metadata_field_separator",
-    'desc' => "{HTMLPlugin.metadata_field_separator}",
-    'type' => "string",
-    'deft' => "" },
+#     { 'name' => "metadata_fields",
+#       'desc' => "{HTMLPlugin.metadata_fields}",
+#       'type' => "string",
+#       'deft' => "Title,Author,Subject,Keywords" },
+#     { 'name' => "metadata_field_separator",
+#   'desc' => "{HTMLPlugin.metadata_field_separator}",
+#   'type' => "string",
+#   'deft' => "" },
      { 'name' => "dpi",
        'desc' => "{PDFv2Plugin.dpi}",
@@ -106 +106 @@
       { 'name' => "use_realistic_book",
         'desc' => "{PDFPlugin.use_realistic_book}",
-    'type' => "flag"}
+    'type' => "flag" }
      ];
 
@@ -126 +126 @@
     my $pdfbox_converter_self = new PDFBoxConverter($pluginlist, $inputargs, $hashArgOptLists);
     my $cbf_self = new ConvertBinaryFile($pluginlist, $inputargs, $hashArgOptLists);
-    my $self = BaseImporter::merge_inheritance($pdfbox_converter_self, $cbf_self);
+    my $self = BaseImporter::merge_inheritance($pdfbox_converter_self, $cbf_self); # this param order seems necessary to preserve the default/user-selected value for the convert_to option
     
     if ($self->{'info_only'}) {
@@ -151 +151 @@
 
     if ($self->{'convert_to'} eq "auto") {
-    # choose pretty_html is the best default option when using xpdftools
-    $self->{'convert_to'} = "pretty_html";
+    # defaulting to paged_pretty_html, as it's the best default option when using xpdftools
+    $self->{'convert_to'} = "paged_pretty_html";
+    &gsprintf::gsprintf(STDERR, "PDFv2Plugin: {PDFv2Plugin.auto_output_default}\n", $self->{'convert_to'});
     }
     if ($self->{'use_realistic_book'}) {
     if ($self->{'convert_to'} ne "html") {
-        print STDERR "PDFs will be converted to HTML for realistic book functionality\n";
+        &gsprintf::gsprintf(STDERR, "PDFv2Plugin: {PDFPlugin.html_for_realistic_book}\n");
         $self->{'convert_to'} = "html";
     }
@@ -424 +425 @@
     # Copying file open/close code from CommonUtil::utf8_write_file()
     if (!open (OUTFILE, ">:utf8", $output_filename)) {
-    gsprintf(STDERR, "PDFv2Plugin::xpdftohtml_convert_post_process {CommonUtil.could_not_open_for_writing} ($!)\n", $output_filename);
+    &gsprintf::gsprintf(STDERR, "PDFv2Plugin::xpdftohtml_convert_post_process {CommonUtil.could_not_open_for_writing} ($!)\n", $output_filename);
     die "\n";
     }