From ba39c5a65a2aeeb695b1434b1d7cb781d110c1b2 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Wed, 24 May 2000 22:47:54 +0000 Subject: [PATCH] r58: *** empty log message *** --- cgi-bin/ctsim.cgi.in | 112 ++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 59 deletions(-) diff --git a/cgi-bin/ctsim.cgi.in b/cgi-bin/ctsim.cgi.in index 4a2824f..660ac60 100755 --- 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.
\n"; $out .= "$error"; } 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 .= "

Command Output

$cmdout
\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/
/gms; - $png_ir_out_html =~ s/\n/
/gms; - $png_rs_out_html =~ s/\n/
/gms; - $png_diff_out_html =~ s/\n/
/gms; - $out .= "\n"; - $out .= "\n"; - $out .= "\n"; - $out .= "\n"; - $out .= "\n"; - $out .= "\n"; - $out .= "
Phantom ImageReconstructed Image

$png_gp_out
$png_ir_out
Raysum SinusoidPhantom/Reconst Error

$png_rs_out
$diff_out
$png_diff_out
"; - $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 .= "

Command Output

$cmdout
\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/
/gms; + $png_ir_out_html =~ s/\n/
/gms; + $png_rs_out_html =~ s/\n/
/gms; + $png_diff_out_html =~ s/\n/
/gms; + $out .= "\n"; + $out .= "\n"; + $out .= "\n"; + $out .= "\n"; + $out .= "\n"; + $out .= "\n"; + $out .= "
Phantom ImageReconstructed Image

$png_gp_out
$png_ir_out
Raysum SinusoidPhantom/Reconst Error

$png_rs_out
$diff_out
$png_diff_out
"; + $out .= "Execution time: $execution_time seconds\n"; } $out .= "
\n"; -- 2.34.1