Changeset 2743 for trunk/gsdl

Timestamp:

2001-09-20T14:40:57+12:00 (23 years ago)

Author:

jrm21

Message:

Now processes the images correctly if converting a file that is not in the
current directory.

File:

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

trunk/gsdl/bin/script/pdftohtml.pl

@@ -182 +182 @@
     my @images;
 
-
-    open (IMAGES, "images.log") || 
-    open (IMAGES, "image.log") ||
+    my $directory=$output_filestem;
+    $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>) {
@@ -195 +197 @@
     my $cmd = "";
     if ($ENV{'GSDLOS'} =~ /^windows/i) {
-        $cmd = "pnmtopng \"$image\"";
+        $cmd = "pnmtopng \"${directory}$image\"";
         if (system($cmd)!=0) {
         print STDERR "Error executing $cmd\n";
@@ -204 +206 @@
         my @nameparts = split(/\./, $image);
         my $image_base = shift(@nameparts);
-
-        $cmd = "pnmtopng $image > $image_base.png 2>/dev/null";
+        $cmd = "pnmtopng ${directory}$image > ${directory}$image_base.png 2>/dev/null";
         if (system($cmd)!=0) {
-        $cmd = "convert $image $image_base.png 2>/dev/null";
+        $cmd = "convert ${directory}$image ${directory}$image_base.png 2>/dev/null";
         if (system($cmd)!=0) {
             print STDERR "Cannot convert $image into PNG format (tried `pnmtopng' and `convert')...\n";