Changeset 2656 for trunk/gsdl/bin/script/gsConvert.pl

Timestamp:

2001-07-18T11:55:26+12:00 (23 years ago)

Author:

jrm21

Message:

replaced some of the -e (exist) tests with -s (size>0) tests when
determining if any output was created, as the shell creates the file when
" > xxx.html" is part of the command.

File:

• trunk/gsdl/bin/script/gsConvert.pl (modified) (8 diffs)

trunk/gsdl/bin/script/gsConvert.pl

@@ -358 +358 @@
     # Was the conversion successful?
 
-    if (-e "$output_filestem.html") {
+    if (-s "$output_filestem.html") {
     open(TMP, "$output_filestem.html");
     $line = <TMP>;
@@ -367 +367 @@
     } else {
         # An error of some sort occurred
-        &util::rm("$output_filestem.html");
+        &util::rm("$output_filestem.html") if -e "$output_filestem.html";
         &util::rm("$output_filestem.err") if -e "$output_filestem.err";
     }
@@ -396 +396 @@
     if (system($cmd)!=0)
     {
-    print STDERR "Error executing rtf converter: $!. Continuing...\n";
+    print STDERR "Error executing rtf converter: $!.\n";
+    # don't currently bother printing out error log...
+    # keep going, in case it still created an HTML file...
     }
 
@@ -402 +404 @@
 
     # Was the conversion successful?
-    if (-e "$output_filestem.html") {
+    if (-s "$output_filestem.html") {
     return 1;
     }
+
+    &util::rm("$output_filestem.html") if (-e "$output_filestem.html");
 
     return 0;
@@ -421 +425 @@
     $!=0;
 
-    if (system($cmd)!=0)
+    my $retval=system($cmd);
+    if ($retval!=0)
     {
     print STDERR "Error executing $cmd";
     if ($!) {print STDERR ": $!";} 
     print STDERR "\n";
-    return 0;
     }
 
     # make sure the converter made something
-    if (! -e "$output_filestem.html")
+    if ($retval!=0 || ! -s "$output_filestem.html")
     {
     &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
-    # print out the converters std err, if any
-    if (-e "$output_filestem.err") {
+    # print out the converter's std err, if any
+    if (-s "$output_filestem.err") {
         open (ERRLOG, "$output_filestem.err") || die "$!";
         print STDERR "pdftohtml:\n";
@@ -442 +446 @@
         close ERRLOG;
     }
+    &util::rm("$output_filestem.html") if (-e "$output_filestem.html");
+    &util::rm("$output_filestem.err") if (-e "$output_filestem.err");
     return 0;
     }
 
+    &util::rm("$output_filestem.err") if (-e "$output_filestem.err");
     &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
     return 1;
@@ -466 +473 @@
 
     # make sure the converter made something
-    if (! -e "$output_filestem.text")
-    {
-    &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
+    if (! -s "$output_filestem.text")
+    {
     # print out the converters std err, if any
-    if (-e "$output_filestem.err") {
+    if (-s "$output_filestem.err") {
         open (ERRLOG, "$output_filestem.err") || die "$!";
         print STDERR "pdftotext:\n";
@@ -478 +484 @@
         close ERRLOG;
     }
+    # does this converter create a .out file?
+    &util::rm("$output_filestem.out") if (-e "$output_filestem.out");
+    &util::rm("$output_filestem.text") if (-e "$output_filestem.text");
+    &util::rm("$output_filestem.err") if (-e "$output_filestem.err");
+
     return 0;
     }
-
     &util::rm("$output_filestem.err") if (-e "$output_filestem.err");
     return 1;