many small bug fixes

1 files changed, 137 insertions, 207 deletions

diff --git a/boca-1.5.0/src/private/autojudging.php b/boca-1.5.0/src/private/autojudging.php
index cdd1e2e..d5c49df 100755
--- a/boca-1.5.0/src/private/autojudging.php
+++ b/boca-1.5.0/src/private/autojudging.php
@@ -82,7 +82,13 @@ $cf = globalconf();
 $ip = $cf["ip"];
 $activecontest=DBGetActiveContest();
 $prevsleep=0;
+$dodebug=1;
 while(42) {
+if(!isset($dodebug)) {
+	if(isset($dir)) cleardir($dir);
+	if(isset($name)) unlink($name);
+}
+
 if(($run = DBGetRunToAutojudging($activecontest["contestnumber"], $ip)) === false) {
   if($prevsleep==0)
     echo "Nothing to do. Sleeping...";
@@ -129,86 +135,39 @@ chdir($dir);
 
 echo "Using directory $dir (contest=$contest, site=$site, run=$number)\n";
 
-/*
-if($run["scriptoid"]=="" || $run["scriptname"]=="") {
-	LogLevel("Autojuging: Script file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Compiling/running script file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: compiling/running script not defined");
-	continue;
-}
-if($run["compscriptoid"]=="" || $run["compscriptname"]=="") {
-	LogLevel("Autojuging: Comparing script file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Comparing script file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: comparing script not defined");
-	continue;
-}
-*/
 if($run["sourceoid"]=="" || $run["sourcename"]=="") {
 	LogLevel("Autojuging: Source file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Source file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: source file not defined");
+	echo "Source file not defined (contest=$contest, site=$site, run=$number)\n";
+	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: source file not defined");
 	continue;
 }
 if($run["inputoid"]=="" || $run["inputname"]=="") {
 	LogLevel("Autojuging: problem package not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "Package file not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file not defined");
+	echo "Package file not defined (contest=$contest, site=$site, run=$number)\n";
+	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file not defined");
 	continue;
 }
-/*
-if($run["soloid"]=="" || $run["solname"]=="") {
-	LogLevel("Autojuging: sol file not defined (run=$number, site=$site, contest=$contest)",1);
-        echo "solfile not defined (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: correct output file not defined");
-	continue;
-}
-*/
 $c = DBConnect();
 DBExec($c, "begin work", "Autojudging(exporttransaction)");
-/*
-if(DB_lo_export($c, $run["scriptoid"], $dir . $ds . $run["scriptname"]) === false) {
-        DBExec($c, "rollback work", "Autojudging(rollback-script)");
-	LogLevel("Autojuging: Unable to export script file (run=$number, site=$site, contest=$contest)",1);
-        echo "Error exporting compiling/running script file ${run["scriptname"]} (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
-        DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: unable to export compiling/running script");
-	continue;
-}
-*/
-if(DB_lo_export($c, $run["sourceoid"], $dir . $ds . $run["sourcename"]) === false) {
+if(DB_lo_export($contest,$c, $run["sourceoid"], $dir . $ds . $run["sourcename"]) === false) {
         DBExec($c, "rollback work", "Autojudging(rollback-source)");
 	LogLevel("Autojudging: Unable to export source file (run=$number, site=$site, contest=$contest)",1);
         echo "Error exporting source file ${run["sourcename"]} (contest=$contest, site=$site, run=$number)\n";
-	cleardir($dir);
-	unlink($name);
 	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: unable to export source file");
 	DBExec($c, "commit", "Autojudging(exportcommit)");
 	continue;
 }
 if(is_readable($cache . $ds . $run["inputoid"] . "." . $run["inputname"])) {
 	DBExec($c, "commit", "Autojudging(exportcommit)");
-	echo "Getting problem package file from local cache\n";
+	echo "Getting problem package file from local cache: " . $cache . $ds . $run["inputoid"] . "." . $run["inputname"] . "\n";
 	$s = file_get_contents($cache .	$ds . $run["inputoid"]	. "." . $run["inputname"]);
 	file_put_contents($dir . $ds . $run["inputname"], decryptData($s,$key));
 } else {
-	echo "Downloading problem package file from db\n";
-	if(DB_lo_export($c, $run["inputoid"], $dir . $ds . $run["inputname"]) === false) {
+	echo "Downloading problem package file from db into: " . $dir . $ds . $run["inputname"] . "\n";
+	if(DB_lo_export($contest,$c, $run["inputoid"], $dir . $ds . $run["inputname"]) === false) {
         DBExec($c, "rollback work", "Autojudging(rollback-input)");
 		LogLevel("Autojudging: Unable to export problem package file (run=$number, site=$site, contest=$contest)",1);
         echo "Error exporting problem package file ${run["inputname"]} (contest=$contest, site=$site, run=$number)\n";
-		cleardir($dir);
-		unlink($name);
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: unable to export problem package file");
 		DBExec($c, "commit", "Autojudging(exportcommit)");
 		continue;
@@ -221,138 +180,77 @@ if(is_readable($cache . $ds . $run["inputoid"] . "." . $run["inputname"])) {
 		$zip->extractTo($dir . $ds . "problemdata");
 		$zip->close();
 	} else {
-		echo 'Failed to unzip the file -- please check the problem package\n';
+		echo "Failed to unzip the package file -- please check the problem package (maybe it is encrypted?)\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
-	if(($info=file($dir . $ds . "problemdata" . $ds . "description" . $ds . 'problem.info'))===false) {
-		echo 'Problem content missing (description/problem.info) -- please check the problem package\n';
-		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+	if(($info=@parse_ini_file($dir . $ds . "problemdata" . $ds . "description" . $ds . 'problem.info'))===false) {
+		echo "Problem content missing (description/problem.info) -- please check the problem package\n";
+		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is incomplete");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
-	$basename='';
-	foreach($info as $line) {
-		$a=explode('=',$line);
-		if(trim($a[0])=='basename') {
-			$basename=trim($a[1]);
-			break;
-		}
-	}
+	$descfile=trim(sanitizeText($info['descfile']));
+	$basename=trim(sanitizeText($info['basename']));
+	$fullname=trim(sanitizeText($info['fullname']));
 	if($basename=='') {
-		echo 'Problem content missing (description/problem.info) -- please check the problem package\n';
+		echo "Problem content missing (description/problem.info) -- please check the problem package\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
 	if(!is_dir($dir . $ds . "problemdata" . $ds . "limits")) {
-		echo 'Problem content missing (limits) -- please check the problem package\n';
+		echo "Problem content missing (limits) -- please check the problem package\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		cleardir($dir . $ds . "problemdata");
 		continue;
 	}
 	chdir($dir . $ds . "problemdata" . $ds . "limits");
+	$limits[$basename]=array();
 	foreach(glob($dir . $ds . "problemdata" . $ds . "limits" .$ds . '*') as $file) {
 		chmod($file,0700);
 		$ex = escapeshellcmd($file);
 		$ex .= " >stdout 2>stderr";
-		echo "Executing INIT SCRIPT " . $ex . "\n";
+		echo "Executing INIT SCRIPT " . $ex . " at " . getcwd() . "\n";
 		if(system($ex, $retval)===false) $retval=-1;
 		if($retval != 0) {
-			echo 'Error running script -- please check the problem package\n';
+			echo "Error running script -- please check the problem package\n";
 			DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+			cleardir($dir . $ds . "problemdata");
 			continue;
 		}
-		$limits[$basename] = file('stdout');
+		$limits[$basename][basename($file)] = file('stdout',FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
 	}
-
+	$cont=false;
 	foreach(glob($dir . $ds . "problemdata" . $ds . "tests" .$ds . '*') as $file) {
 		chdir($dir . $ds . "problemdata" . $ds . "tests");
 		chmod($file,0700);
 		$ex = escapeshellcmd($file);
 		$ex .= " >stdout 2>stderr";
-		echo "Executing TEST SCRIPT " . $ex . "\n";
+		echo "Executing TEST SCRIPT " . $ex . " at " . getcwd() . "\n";
 		if(system($ex, $retval)===false) $retval=-1;
 		if($retval != 0) {
-			echo 'Error running test script -- please check the problem package\n';
+			echo "Error running test script -- please check the problem package\n";
 			DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: internal test script failed");
-			continue;
+			$cont=true;
+			break;
 		}
 	}
 	cleardir($dir . $ds . "problemdata");
+	if($cont)
+		continue;
+
 	$s = file_get_contents($dir . $ds . $run["inputname"]);
 	file_put_contents($cache . $ds . $run["inputoid"] . "." . $run["inputname"], encryptData($s,$key));
 }
 
-function exitmsg($retval) {
-/* FROM SAFEEXEC
-# 0 ok
-# 1 compile error
-# 2 runtime error
-# 3 timelimit exceeded
-# 4 internal error
-# 5 parameter error
-# 6 internal error
-# 7 memory limit exceeded
-# 8 security threat
-# 9 runtime error
-*/
-/*
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 0, 'Not answered yet', 'f', 't')", "DBNewContest(insert fake answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 1, 'YES', 't', 'f')", "DBNewContest(insert YES answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 2, 'NO - Compilation error', 'f', 'f')", "DBNewContest(insert CE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 3, 'NO - Runtime error', 'f', 'f')", "DBNewContest(insert RE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 4, 'NO - Time limit exceeded', 'f', 'f')", "DBNewContest(insert TLE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 5, 'NO - Presentation error', 'f', 'f')", "DBNewContest(insert PE answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 6, 'NO - Wrong answer', 'f', 'f')", "DBNewContest(insert WA answer)");
-	DBExec($c, "insert into answertable (contestnumber, answernumber, runanswer, yes, fake) values ".
-			"($n, 7, 'NO - Contact staff', 'f', 'f')", "DBNewContest(insert CS answer)");
-*/
-	if($retval==-1) {
-		$answer="Internal error while executing run command";
-		$retval = 7; // contact staff
-	}
-	else if($retval==1) {
-		$answer="Compilation error";
-		$retval = 2; // compilation error
-	}
-	else if($retval==2) {
-		$answer="Runtime error";
-		$retval = 3; // runtime error
-	}
-	else if($retval==3) {
-		$answer="Time limit exceeded";
-		$retval = 4; // timelimit exceeded
-	}
-	else if($retval==4) {
-		$answer="safeexec internal error (4)";
-		$retval = 7; // contact staff
-	}
-	else if($retval==5) {
-		$answer="safeexec error: parameter problem";
-		$retval = 7; // contact staff
-	}
-	else if($retval==6) {
-		$answer="safeexec internal error (6)";
-		$retval = 7; // contact staff
-	}
-	else if($retval==7) {
-		$answer="Runtime error (memory-limit)";
-		$retval = 3; // runtime error
-	}
-	else if($retval==8) {
-		$answer="Code generates security threat";
-		$retval = 3; // runtime error
-	}
-	else if($retval==9) {
-		$answer="Runtime error";
-		$retval = 3; // runtime error
-	}
-	return array($retval,$answer);
+if(!isset($limits[$basename][$run["extension"]][0]) || !is_numeric($limits[$basename][$run["extension"]][0]) ||
+   !isset($limits[$basename][$run["extension"]][1]) || !is_numeric($limits[$basename][$run["extension"]][1]) ||
+   !isset($limits[$basename][$run["extension"]][2]) || !is_numeric($limits[$basename][$run["extension"]][2]) ) {
+	echo "Failed to find proper limits information for the problem -- please check the problem package\n";
+	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+	continue;
 }
 
 // COMPILATION
@@ -364,31 +262,46 @@ function exitmsg($retval) {
 
 $zip = new ZipArchive;
 if ($zip->open($dir . $ds . $run["inputname"]) === true) {
-	$zip->extractTo($dir, "compile" . $ds . $run["extension"]);
+	$zip->extractTo($dir, array("compile" . $ds . $run["extension"]));
 	$zip->close();
 } else {
-	echo 'Failed to unzip the file -- please check the problem package\n';
+	echo "Failed to unzip the package file -- please check the problem package\n";
 	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
 	continue;
 }
 
 $script = $dir . $ds . 'compile' . $ds . $run["extension"];
 if(!is_file($script)) {
-	echo 'Error (not found) compile script for '.$run["extension"].' -- please check the problem package\n';
+	echo "Error (not found) compile script for ".$run["extension"]." -- please check the problem package\n";
 	DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: compile script failed (".$run["extension"].")");
 	continue;
 }
 
+chdir($dir);
+@unlink('allout');
+system('touch allout');
+@unlink('allerr');
+system('touch allerr');
+
 chmod($script, 0700);
 $ex = escapeshellcmd($script) ." ".
 	escapeshellarg($run["sourcename"])." ".
-	"run.exe ".
-	escapeshellarg(trim($limits[$run["extension"]][0]))." ".
-	escapeshellarg(trim($limits[$run["extension"]][2]));
+	escapeshellarg($basename) . " ".
+	escapeshellarg(trim($limits[$basename][$run["extension"]][0]))." ".
+	escapeshellarg(trim($limits[$basename][$run["extension"]][2]));
 $ex .= " >stdout 2>stderr";
-echo "Executing " . $ex . "\n";
+echo "Executing " . $ex . " at " . getcwd() . "\n";
 if(system($ex, $retval)===false) $retval=-1;
 
+if(is_readable('stdout')) {
+    system('echo ##### COMPILATION STDOUT: >> allerr');
+	system('cat stdout >> allerr');
+}
+if(is_readable('stderr')) {
+    system('echo ##### COMPILATION STDERR: >> allerr');
+	system('cat stderr >> allerr');
+}
+
 if($retval != 0) {
 	list($retval,$answer) = exitmsg($retval);
 	$answer = "(WHILE COMPILING) " . $answer;
@@ -401,48 +314,70 @@ if($retval != 0) {
 //# $5 maximum allowed memory (in KBytes)
 
 	$zip = new ZipArchive;
+	$inputlist = array();
+	$ninputlist = 0;
+	$outputlist = array();
+	$noutputlist = 0;
 	if ($zip->open($dir . $ds . $run["inputname"]) === true) {
-		$zip->extractTo($dir, array("run" . $ds . $run["extension"],"input" . $ds . '*'));
-		$zip->close();
+		for($i = 0; $i < $zip->numFiles; $i++) {
+			$filename = $zip->getNameIndex($i);
+			$pos = strrpos(dirname($filename),"input");
+			if($pos !== false && $pos==strlen(dirname($filename))-5) {
+				$inputlist[$ninputlist++] = 'input' . $ds . basename($filename);
+				$outputlist[$noutputlist++] = 'output' . $ds . basename($filename);
+			}
+		}
+		$zip->extractTo($dir, array_merge(array("run" . $ds . $run["extension"]),$inputlist));
+		$zip->close();    
 	} else {
-		echo 'Failed to unzip the file (inputs) -- please check the problem package\n';
+		echo "Failed to unzip the file (inputs) -- please check the problem package\n";
 		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
 		continue;
 	}
-	chdir($dir);
-	@unlink('allout');
-	@unlink('allerr');
 	$retval = 0;
 	$script = $dir . $ds . 'run' . $ds . $run["extension"];
+	if(!is_file($script)) {
+		echo "Failed to unzip the run script -- please check the problem package\n";
+		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		continue;
+	}
 	chmod($script, 0700);
 	mkdir('team', 0755);
-	$d = opendir($dir . $ds . "input");
-	while (($file = readdir($d)) !== false) {
-		if(is_file($dir . $ds . "input" . $ds . $file)) {
-			$ex = escapeshellcmd($script) ." ".
-				"run.exe ".
-				escapeshellarg($dir . $ds . "input" . $ds . $file)." ".
-				escapeshellarg(trim($limit[0]))." ".
-				escapeshellarg(trim($limit[1]))." ".
-				escapeshellarg(trim($limit[2]));
-			$ex .= " >stdout 2>stderr";
-			echo "Executing " . $ex . " for input " . $file . "\n";
-			if(system($ex, $retval)===false) $retval=-1;
-			foreach (glob($dir . $ds . '*') as $fne) {
-				@chown($fne,"nobody");
-				@chmod($fne,0755);
-			}
-			if(is_readable('stderr0'))
-				system('cat stderr0 >> stderr');
-			system('echo ##### STDERR FOR FILE ' . escapeshellarg($file) . ' >> allerr');
-			system('cat stderr >> allerr');
-			system('cat stdout > team' . $ds . escapeshellarg($file));
-			system('echo ##### STDOUT FOR FILE ' . escapeshellarg($file) . ' >> allout');
-			system('cat stdout >> allout');
-			if($retval != 0) {
-				list($retval,$answer) = exitmsg($retval);
-				$answer = "(WHILE RUNNING) " . $answer;
-				break;
+	if($ninputlist == 0) {
+		echo "Failed to read input files from ZIP -- please check the problem package\n";
+		DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
+		continue;
+	} else {
+		foreach($inputlist as $file) {
+			$file = basename($file);
+			if(is_file($dir . $ds . "input" . $ds . $file)) {
+				$ex = escapeshellcmd($script) ." ".
+					escapeshellarg($basename) . " ".
+					escapeshellarg($dir . $ds . "input" . $ds . $file)." ".
+					escapeshellarg(trim($limits[$basename][$run["extension"]][0]))." ".
+					escapeshellarg(trim($limits[$basename][$run["extension"]][1]))." ".
+					escapeshellarg(trim($limits[$basename][$run["extension"]][2]));
+				$ex .= " >stdout 2>stderr";
+				echo "Executing " . $ex . " at " . getcwd() . " for input " . $file . "\n";
+				if(system($ex, $retval)===false) $retval=-1;
+				foreach (glob($dir . $ds . '*') as $fne) {
+					@chown($fne,"nobody");
+					@chmod($fne,0755);
+				}
+				if(is_readable('stderr0'))
+					system('cat stderr0 >> stderr');
+				system('echo ##### STDERR FOR FILE ' . escapeshellarg($file) . ' >> allerr');
+				system('cat stderr >> allerr');
+				system('cat stdout > team' . $ds . escapeshellarg($file));
+				system('echo ##### STDOUT FOR FILE ' . escapeshellarg($file) . ' >> allout');
+				system('cat stdout >> allout');
+				if($retval != 0) {
+					list($retval,$answer) = exitmsg($retval);
+					$answer = "(WHILE RUNNING) " . $answer;
+					break;
+				}
+			} else {
+				echo "==> ERROR reading input file " . $dir . $ds . "input" . $ds . $file . " - skipping it!\n";
 			}
 		}
 	}
@@ -450,24 +385,24 @@ if($retval != 0) {
 		echo "Processing results\n";
 		$zip = new ZipArchive;
 		if ($zip->open($dir . $ds . $run["inputname"]) === true) {
-			$zip->extractTo($dir, array("compare" . $ds . $run["extension"],"output" . $ds . '*'));
+			$zip->extractTo($dir, array_merge(array("compare" . $ds . $run["extension"]),$outputlist));
 			$zip->close();
 		} else {
-			echo 'Failed to unzip the file (outputs) -- please check the problem package\n';
+			echo "Failed to unzip the file (outputs) -- please check the problem package\n";
 			DBGiveUpRunAutojudging($contest, $site, $number, $ip, "Autojuging error: problem package file is invalid");
 			continue;
 		}
 		$script = $dir . $ds . 'compare' . $ds . $run["extension"];
 		$retval = 0;
 		chmod($script, 0700);
-		$d = opendir($dir . $ds . "output");
-		while (($file = readdir($d)) !== false) {
-			if(is_file($dir . $ds . "output" . $ds . $file)) {
+		foreach($outputlist as $file) {
+			$file = basename($file);
+			if(is_file($dir . $ds . 'output' . $ds . $file)) {
 				$ex = escapeshellcmd($script) ." ".
-					escapeshellarg("team" . $ds . $file)." ".
-					escapeshellarg("output" . $ds . $file)." ".
-					escapeshellarg("input" . $ds . $file) . " >compout";
-				echo "Executing " . $ex . "\n";
+					escapeshellarg($dir . $ds . "team" . $ds . $file)." ".
+					escapeshellarg($dir . $ds . "output" . $ds . $file)." ".
+					escapeshellarg($dir . $ds . "input" . $ds . $file) . " >compout";
+				echo "Executing " . $ex . " at " . getcwd() . " for output file $file\n";
 				$answer = system($ex, $localretval);
 
 				$fp = fopen($dir . $ds . "allerr", "a+");
@@ -503,6 +438,8 @@ if($retval != 0) {
 						$answer='Presentation error';
 					}
 				}
+			} else {
+				echo "==> ERROR reading output file " . $dir . $ds . 'output' . $ds . $file . " - skipping it!\n";
 			}
 		}
 	}
@@ -515,23 +452,16 @@ if($retval > 9) {
 			 "(run=$number, site=$site, contest=$contest)",1);
 	echo "Autojudging script returned unusual code $retval ($anstmp)".
 		"(contest=$contest, site=$site, run=$number)\n";
-//  cleardir($dir);
-//  unlink($name);
-//  DBGiveUpRunAutojudging($contest, $site, $number, $ip, "(unusual code: $retval) " . $anstmp);
-//  continue;
 	$answer = "(check output files - unusual code: $retval) " . $anstmp;
-	
 	// contact staff
 	$retval = 7;
 }
 
-echo "Sending results to server\n";
+echo "Sending results to server...\n";
+echo "out==> "; system("tail -n1 ". $dir.$ds.'allout');
+echo "err==> "; system("tail -n1 ". $dir.$ds.'allerr');
 DBUpdateRunAutojudging($contest, $site, $number, $ip, $answer, $dir.$ds.'allout', $dir.$ds.'allerr', $retval);
 LogLevel("Autojudging: answered '$answer' (run=$number, site=$site, contest=$contest)",3);
 echo "Autojudging answered '$answer' (contest=$contest, site=$site, run=$number)\n";
-if(!isset($dodebug)) {
-	cleardir($dir);
-	unlink($name);
-}
 }
 ?>