Changeset 32223 for main/trunk/greenstone2

Timestamp:

2018-06-27T16:50:52+12:00 (6 years ago)

Author:

ak19

Message:

When no output mode for PDFPlugin has been set by the user, the output mode now defaults to paged_html (previously html). paged_html uses xpdftools to do the PDF conversion, which will apparently work for all versions of PDF so it gives better version coverage than the old pdftohtml.

Location:

main/trunk/greenstone2

Files:

• bin/script/gsConvert.pl (modified) (2 diffs)
• perllib/plugins/PDFPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/bin/script/gsConvert.pl

@@ -324 +324 @@
     # Attempt conversion to HTML
     # Uses the old pdftohtml that doesn't work for newer PDF versions
-    #if ($output_type =~ m/^html/i) {
-    if (!$output_type || ($output_type =~ m/^html/i)) {
+    if ($output_type =~ m/^html/i) {
+    #if (!$output_type || ($output_type =~ m/^html/i)) {
     $success = &pdf_to_html($dirname, $input_filename, $output_filestem);
     if ($success) {
@@ -335 +335 @@
     # will be the new default for PDFs when output_type for PDF docs is not specified
     # (once our use of xpdftools' pdftohtml has been implemented on win and mac).
-    if ($output_type =~ m/paged_html/i) {
-    #if (!$output_type || ($output_type =~ m/paged_html/i)) {
+    #if ($output_type =~ m/paged_html/i) {
+    if (!$output_type || ($output_type =~ m/paged_html/i)) {
     $success = &xpdf_to_html($dirname, $input_filename, $output_filestem);
     if ($success) {

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

@@ -156 +156 @@
     elsif ($self->{'convert_to'} eq "auto") {
     # choose html ?? is this the best option
-    $self->{'convert_to'} = "html";
+    $self->{'convert_to'} = "paged_html";
     }
     if ($self->{'use_realistic_book'}) {