Changeset 32223

Show
Ignore:
Timestamp:
27.06.2018 16:50:52 (4 weeks 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/gsConvert.pl

    r32221 r32223  
    324324    # Attempt conversion to HTML 
    325325    # Uses the old pdftohtml that doesn't work for newer PDF versions 
    326     #if ($output_type =~ m/^html/i) { 
    327     if (!$output_type || ($output_type =~ m/^html/i)) { 
     326    if ($output_type =~ m/^html/i) { 
     327    #if (!$output_type || ($output_type =~ m/^html/i)) { 
    328328    $success = &pdf_to_html($dirname, $input_filename, $output_filestem); 
    329329    if ($success) { 
     
    335335    # will be the new default for PDFs when output_type for PDF docs is not specified 
    336336    # (once our use of xpdftools' pdftohtml has been implemented on win and mac). 
    337     if ($output_type =~ m/paged_html/i) { 
    338     #if (!$output_type || ($output_type =~ m/paged_html/i)) { 
     337    #if ($output_type =~ m/paged_html/i) { 
     338    if (!$output_type || ($output_type =~ m/paged_html/i)) { 
    339339    $success = &xpdf_to_html($dirname, $input_filename, $output_filestem); 
    340340    if ($success) { 
  • main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm

    r32222 r32223  
    156156    elsif ($self->{'convert_to'} eq "auto") { 
    157157    # choose html ?? is this the best option 
    158     $self->{'convert_to'} = "html"; 
     158    $self->{'convert_to'} = "paged_html"; 
    159159    } 
    160160    if ($self->{'use_realistic_book'}) {