Changeset 3720

Timestamp:

2003-01-28T16:22:26+13:00 (21 years ago)

Author:

sjboddie

Message:

Added options to PDFPlug to take advantage of the improvements in
version 0.34 of pdftohtml. It now works much better for non latin
input documents (producing UTF-8 encoded HTML).

Location:

trunk/gsdl

Files:

• bin/script/gsConvert.pl (modified) (4 diffs)
• bin/script/pdftohtml.pl (modified) (5 diffs)
• perllib/plugins/ConvertToPlug.pm (modified) (1 diff)
• perllib/plugins/PDFPlug.pm (modified) (4 diffs)

trunk/gsdl/bin/script/gsConvert.pl

@@ -59 +59 @@
 
 my $use_strings;
+my $pdf_complex;
+my $pdf_zoom;
+my $pdf_ignore_images;
 
 sub print_usage
@@ -70 +73 @@
     print STDERR "\t-output\thtml|text\n";
     print STDERR "\t-timeout\t<max cpu seconds>\t(ulimit on unix systems)\n";
-    print STDERR "\t-use_strings\t(use strings to extract text if conversion fails)\n";
+    print STDERR "\t-use_strings\tuse strings to extract text if conversion fails\n";
+    print STDERR "\t-pdf_complex\tuse complex output when converting PDF to HTML\n";
+    print STDERR "\t-pdf_ignore_images\tdon't attempt to extract images when\n";
+    print STDERR "\t\tconverting PDF to HTML\n";
+    print STDERR "\t-pdf_zoom\tfactor by which to zoom PDF (only useful if\n";
+    print STDERR "\t\t-pdf_complex is set\n";
     exit(1);
 }
@@ -89 +97 @@
              'timeout/\d+/0',\$timeout,
              'verbose/\d+/0',   \$verbose,
-             'use_strings', \$use_strings))
+             'use_strings', \$use_strings,
+             'pdf_complex', \$pdf_complex,
+             'pdf_zoom/\d+/2', \$pdf_zoom
+             ))
     {
     print_usage();
@@ -628 +639 @@
     $cmd = "";
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    $cmd .= "perl -S pdftohtml.pl ";
+    $cmd .= "perl -S pdftohtml.pl -zoom $pdf_zoom";
+    $cmd .= " -c" if ($pdf_complex);
+    $cmd .= " -i" if ($pdf_ignore_images);
     $cmd .= " \"$input_filename\" \"$output_filestem\"";
     

trunk/gsdl/bin/script/pdftohtml.pl

@@ -45 +45 @@
 # note - we don't actually ever use most of these options...
 print STDERR  
-    ("pdftohtml.pl wrapper for pdftohtml version 0.22, modified for GSDL use.\n",
+    ("pdftohtml.pl wrapper for pdftohtml.\n",
      "Usage: pdftohtml [options] <PDF-file> <html-file>\n",
      "Options:\n",
      "\t-i\tignore images (don't extract)\n",
-     "\t-a\tallow images only (continue even if no text is present)\n"
+     "\t-a\tallow images only (continue even if no text is present)\n",
+     "\t-c\tproduce complex output (requires ghostscript)\n",
+     "\t-zoom\tfactor by which to zoom the PDF (only useful if -c is set)\n"
      );
 exit (1);
@@ -56 +58 @@
 sub main {
     my (@ARGV) = @_;
-    my ($allow_no_text,$ignore_images);
+    my ($allow_no_text, $ignore_images, $complex, $zoom);
     
     # read command-line arguments so that
@@ -62 +64 @@
     if (!parsargv::parse(\@ARGV,
              'a', \$allow_no_text,
-             'i', \$ignore_images
+             'i', \$ignore_images,
+             'c', \$complex,
+             'zoom/\d+/2', \$zoom,
              ))
     {
@@ -110 +114 @@
 
     $cmd .= " -i" if ($ignore_images);
-    $cmd .= " -noframes \"$input_filename\" \"$output_filestem.html\"";
+    $cmd .= " -c" if ($complex);
+    $cmd .= " -zoom $zoom";
+    $cmd .= " -noframes -p -enc UTF-8 \"$input_filename\" \"$output_filestem.html\"";
 
 # system() returns -1 if it can't run, otherwise it's $cmds ret val.
@@ -187 +193 @@
     $directory =~ s@[^\/]*$@@;    # assume filename has no embedded slashes...
 
-    open (IMAGES, "${directory}images.log") || 
-    open (IMAGES, "${directory}image.log") ||
-          print STDERR "Error opening image log:$!\n";
-    while (<IMAGES>) {
-    push (@images, $_);
-    }
-    close IMAGES;
-    &util::rm("${directory}image.log") if (-e "${directory}image.log");
+    if (open (IMAGES, "${directory}images.log") || 
+    open (IMAGES, "${directory}image.log")) {
+    while (<IMAGES>) {
+        push (@images, $_);
+    }
+    close IMAGES;
+    &util::rm("${directory}image.log") if (-e "${directory}image.log");
+
+    }
 
     # no need to go any further if there is no text extracted from pdf.

trunk/gsdl/perllib/plugins/ConvertToPlug.pm

@@ -204 +204 @@
     my $output_type = lc($convert_to);
     my $cmd = "perl -S gsConvert.pl -verbose $verbosity ";
+    if (defined $self->{'convert_options'}) {
+    $cmd .= $self->{'convert_options'} . " ";
+    }
     if ($self->{'use_strings'}) {
       $cmd .= "-use_strings ";
     }
     $cmd .= "-errlog \"$errlog\" -output $output_type \"$tmp_filename\"";
+
     $output_type = `$cmd`;
 

trunk/gsdl/perllib/plugins/PDFPlug.pm

@@ -40 +40 @@
             'desc' => "Files matching this regular expression will be blocked from being passed to any later plugins in the list. This has no real effect other than to prevent lots of warning messages about input files you don't care about. Each plugin might have a default block_exp. e.g. by default HTMLPlug blocks any files with .gif, .jpg, .jpeg, .png or .css file extensions.",
             'type' => 'string',
-            'deft' =>  q^^ }
+            'deft' =>  q^^ },
+          { 'name' => "noimages",
+            'desc' =>  "Don't attempt to extract images from PDF.",
+            'type' => "flag" },
+          { 'name' => "complex",
+            'desc' =>  "Create more complex output. With this option set the output html will look much more like the original PDF file. For this to function properly you Ghostscript installed (for *nix gs should be on your path while for windows you must have gswin32c.exe on your path).",
+            'type' => "flag" },
+          { 'name' => "zoom",
+            'desc' =>  "The factor by which to zoomthe PDF for output (this is only useful if -complex is set).",
+            'type' => "int" }
           ];
 
@@ -50 +59 @@
 sub new {
     my $class = shift (@_);
+
+    my ($noimages, $complex, $zoom);
+    
+    if (!parsargv::parse(\@_, 
+             q^noimages^, \$noimages,
+             q^complex^, \$complex,
+             q^zoom/\d+/2^, \$zoom,
+             "allow_extra_options")) {
+
+    print STDERR "\nIncorrect options passed to PDFPlug, check your collect.cfg configuration file\n";
+    &print_usage();
+    die "\n";
+    }
 
     # following title_sub removes "Page 1" added by pdftohtml, and a leading
@@ -81 +103 @@
     my $option_list = $self->{'option_list'};
     push( @{$option_list}, $options );
+
+    # these are passed through to gsConvert.pl by ConvertToPlug.pm
+    $self->{'convert_options'} = "-pdf_zoom $zoom";
+    $self->{'convert_options'} .= " -pdf_complex" if $complex;
+    $self->{'convert_options'} .= " -pdf_ignore_images" if $noimages;
+
+    # pdftohtml will always produce html files encoded as utf-8
+    if ($self->{'input_encoding'} eq "auto") {
+    $self->{'input_encoding'} = "utf8";
+    $self->{'extract_language'} = 1;
+    }
     
     return bless $self, $class;
@@ -89 +122 @@
     print STDERR "\n  usage: plugin PDFPlug [options]\n\n";
     print STDERR "  options:\n";
-    print STDERR "   -convert_to (html|text) plugin converts to TEXT or HTML\n";
-    print STDERR "                           (default html)\n";
-    print STDERR "   -use_sections     create a separate section for each page of the PDF file.\n\n";
+    print STDERR "   -convert_to (html|text) Convert to TEXT or HTML (default html)\n";
+    print STDERR "   -use_sections     Create a separate section for each page\n";
+    print STDERR "                     of the PDF file.\n";
+    print STDERR "   -noimages         Don't attempt to extract images from PDF.\n";
+    print STDERR "   -complex          Create more complex output. With this option\n";
+    print STDERR "                     set the output html will look much more like\n";
+    print STDERR "                     the original PDF file. For this to function\n";
+    print STDERR "                     properly you Ghostscript installed (for *nix\n";
+    print STDERR "                     gs should be on your path while for windows\n";
+    print STDERR "                     you must have gswin32c.exe on your path).\n";
+    print STDERR "   -zoom             The factor by which to zoomthe PDF for output\n";
+    print STDERR "                     (this is only useful if -complex is set).\n\n";
 }