Changeset 2241 for trunk/gsdl/bin/script/pdftohtml.pl

Timestamp:

2001-04-01T21:19:25+12:00 (23 years ago)

Author:

sjboddie

Message:

Tidied up the ConvertToPlug stuff to get it working on Windows 95/98

File:

• trunk/gsdl/bin/script/pdftohtml.pl (modified) (3 diffs)

trunk/gsdl/bin/script/pdftohtml.pl

@@ -177 +177 @@
     print STDERR "pdftohtml.pl: $input_filename appears to have no ";
     print STDERR "textual data. Aborting.\n";
-    print STDERR "num: $unenc_stream_objects and $non_text_objects from $num_objects\n";
+    # print STDERR "num: $unenc_stream_objects and $non_text_objects from $num_objects\n";
     exit(1);
     }
 
     # formulate the command
-    my $pdftohtml = &util::filename_cat($ENV{'GSDLHOME'}, "bin", 
-                    $ENV{'GSDLOS'}, "pdftohtml.bin");
-    return 0 unless (-e "$pdftohtml");
-    
-    $cmd = "";
+    my $cmd = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "pdftohtml.bin");
+
+    # don't include path on windows (to avoid having to play about
+    # with quoting when GSDLHOME might contain spaces) but assume
+    # that the PATH is set up correctly - note also that on windows
+    # we use pdftohtml.exe not pdftohtml.bin
+    $cmd = "pdftohtml" if ($ENV{'GSDLOS'} !~ /^windows$/) {
+
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    $cmd .= "$pdftohtml -noframes";
-    $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
-    $cmd .= " >\"$output_filestem.out\" 2>\"$output_filestem.err\"";
-    
+    $cmd .= " -noframes \"$input_filename\" \"$output_filestem.html\"";
+    $cmd .= " > \"$output_filestem.out\"";
+
+    # attempting to redirect STDERR on windows 95/98 is a bad idea
+    $cmd .= " 2> \"$output_filestem.err\"" 
+    if $ENV{'GSDLOS'} !~ /^windows$/i;
+
     if (system($cmd)>0) {
     print STDERR "Error executing $cmd: $!\n";
@@ -201 +207 @@
     # Need to convert images from PPM format to PNG format
     my @images;
+
 
     open (IMAGES, "images.log");
@@ -212 +219 @@
     my $cmd = "";
     if ($ENV{'GSDLOS'} =~ /^windows/i) {
-        $cmd = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "windows", "pnmtopng.exe");
-        $cmd .= " $image";
+        $cmd = "pnmtopng $image";
         if (system($cmd)!=0) {
         print STDERR "Error executing $cmd\n";