r58: *** empty log message ***

diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in
index 4a2824ffeabf3c37991c6b1db235a7bd967636b5..660ac60b504445ad9182d9db2427424b2b6030c4 100755 (executable)
--- a/cgi-bin/ctsim.cgi.in
+++ b/cgi-bin/ctsim.cgi.in
@@ -140,68 +140,62 @@ if ($error ne "") {
     $out .= "Please correct them and try submitting your request again.</FONT><br>\n";
     $out .= "<i>$error</i>";
 } else {
-    my $gp_out;
-    my $rs_out;
-    my $rs_sdf_out;
-    my $ir_out;
-    my $diff_out;
-    my $png_gp_out;
-    my $png_ir_out;
-    my $png_rs_out;
-    my $png_diff_out;
-    if (1) {
-       $gp_out = `$gp_cmd`;
-       $rs_out .= `$rs_cmd`;
-       $rs_sdf_out .= `$rs_sdf_cmd`;
-       $ir_out .= `$ir_cmd`;
-       $diff_out .= `$diff_cmd`;
-       $png_gp_out .= `$png1_cmd`;
+  my $gp_out;
+  my $rs_out;
+  my $rs_sdf_out;
+  my $ir_out;
+  my $diff_out;
+  my $png_gp_out;
+  my $png_ir_out;
+  my $png_rs_out;
+  my $png_diff_out;
+  $gp_out = `$gp_cmd`;
+  if (-s $phantom_fname) {
+    $rs_out .= `$rs_cmd`;
+    $png_gp_out .= `$png1_cmd`;
+    if (-s $rs_fname) {
+      $rs_sdf_out .= `$rs_sdf_cmd`;
+      $png_rs_out .= `$png3_cmd`;
+      $ir_out .= `$ir_cmd`;
+      if (-s $ir_fname) {
        $png_ir_out .= `$png2_cmd`;
-       $png_rs_out .= `$png3_cmd`;
+       $diff_out .= `$diff_cmd`;
        $png_diff_out .= `$png4_cmd`;
-    } else {
-       $gp_out = `$gp_cmd 2>&1`;
-       $rs_out .= `$rs_cmd 2>&1`;
-       $rs_sdf_out .= `$rs_sdf_cmd 2>&1`;
-       $ir_out .= `$ir_cmd 2>&1`;
-       $diff_out .= `$diff_cmd 2>&1`;
-       $png_gp_out .= `$png1_cmd 2>&1`;
-       $png_ir_out .= `$png2_cmd 2>&1`;
-       $png_rs_out .= `$png3_cmd 2>&1`;
-       $png_diff_out .= `$png4_cmd 2>&1`;
-    }
-    $cmdout = "$gp_cmd\n $gp_out $rs_cmd\n $rs_out $rs_sdf_cmd\n $rs_sdf_out $ir_cmd\n $ir_out $diff_cmd\n $diff_out $png1_cmd\n $png_gp_out $png2_cmd\n $png_ir_out $png3_cmd\n $png_rs_out $png4_cmd\n $png_diff_out";
-    if (open(LOGFILE,">> $logfile")) {
-       flock(LOGFILE,LOCK_EX);
-       seek(LOGFILE, 0, 2);
-       print LOGFILE "Job $tmpid\n";
-       print LOGFILE $cmdout;
-       print LOGFILE "----------------------------------------------------\n";
-       flock(LOGFILE,LOCK_UN);
-       close(LOGFILE);
-    }
-    $gmt_end = time();
-    $execution_time = $gmt_end - $gmt_start;
-    if ($opt_d)
-    {
-       $out .= "<H3>Command Output</H3>$cmdout<HR>\n";
+      }
     }
-    my $png_gp_out_html = $png_gp_out;
-    my $png_ir_out_html = $png_ir_out;
-    my $png_rs_out_html = $png_rs_out;
-    my $png_diff_out_html = $png_diff_out;
-    $png_gp_out_html =~ s/\n/<br>/gms;
-    $png_ir_out_html =~ s/\n/<br>/gms;
-    $png_rs_out_html =~ s/\n/<br>/gms;
-    $png_diff_out_html =~ s/\n/<br>/gms;
-    $out .= "<TABLE><TR><TD>Phantom Image</TD><TD>Reconstructed Image</TD></TR>\n";
-    $out .= "<TR><TD><IMG SRC=\"$phantom_png_url\"><br><FONT SIZE=1>$png_gp_out</FONT></TD>\n";
-    $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_ir_out</FONT></TD></TR>\n";
-    $out .= "<TR><TD>Raysum Sinusoid</TD><TD>Phantom/Reconst Error</TD></TR>\n";
-    $out .= "<TR><TD><IMG SRC=\"$rs_png_url\"><br><FONT SIZE=1>$png_rs_out</FONT></TD>\n";
-    $out .= "<TD><IMG SRC=\"$diff_png_url\"><br><FONT SIZE=2>$diff_out</FONT><br><FONT SIZE=1>$png_diff_out</FONT></TD></TR>\n";
-    $out .= "</TABLE>";
-    $out .= "Execution time: $execution_time seconds\n";
+  }
+
+  $cmdout = "$gp_cmd\n $gp_out $rs_cmd\n $rs_out $rs_sdf_cmd\n $rs_sdf_out $ir_cmd\n $ir_out $diff_cmd\n $diff_out $png1_cmd\n $png_gp_out $png2_cmd\n $png_ir_out $png3_cmd\n $png_rs_out $png4_cmd\n $png_diff_out";
+  if (open(LOGFILE,">> $logfile")) {
+    flock(LOGFILE,LOCK_EX);
+    seek(LOGFILE, 0, 2);
+    print LOGFILE "Job $tmpid\n";
+    print LOGFILE $cmdout;
+    print LOGFILE "----------------------------------------------------\n";
+    flock(LOGFILE,LOCK_UN);
+    close(LOGFILE);
+  }
+  $gmt_end = time();
+  $execution_time = $gmt_end - $gmt_start;
+  if ($opt_d) {
+    $out .= "<H3>Command Output</H3>$cmdout<HR>\n";
+  }
+  my $png_gp_out_html = $png_gp_out;
+  my $png_ir_out_html = $png_ir_out;
+  my $png_rs_out_html = $png_rs_out;
+  my $png_diff_out_html = $png_diff_out;
+  $png_gp_out_html =~ s/\n/<br>/gms;
+  $png_ir_out_html =~ s/\n/<br>/gms;
+  $png_rs_out_html =~ s/\n/<br>/gms;
+  $png_diff_out_html =~ s/\n/<br>/gms;
+  $out .= "<TABLE><TR><TD>Phantom Image</TD><TD>Reconstructed Image</TD></TR>\n";
+  $out .= "<TR><TD><IMG SRC=\"$phantom_png_url\"><br><FONT SIZE=1>$png_gp_out</FONT></TD>\n";
+  $out .= "<TD><IMG SRC=\"$ir_png_url\"><br><FONT SIZE=1>$png_ir_out</FONT></TD></TR>\n";
+  $out .= "<TR><TD>Raysum Sinusoid</TD><TD>Phantom/Reconst Error</TD></TR>\n";
+  $out .= "<TR><TD><IMG SRC=\"$rs_png_url\"><br><FONT SIZE=1>$png_rs_out</FONT></TD>\n";
+  $out .= "<TD><IMG SRC=\"$diff_png_url\"><br><FONT SIZE=2>$diff_out</FONT><br><FONT SIZE=1>$png_diff_out</FONT></TD></TR>\n";
+  $out .= "</TABLE>";
+  $out .= "Execution time: $execution_time seconds\n";
 }
 
 $out .= "<HR>\n";