aboutsummaryrefslogtreecommitdiff
path: root/src/private
diff options
context:
space:
mode:
authorcassiopc <cassiopc@gmail.com>2015-09-25 09:50:00 +0000
committercassiopc <cassiopc@gmail.com>2015-09-25 09:50:00 +0000
commit09134766cd1ce6d19fc77807bd52a899dde2eb05 (patch)
tree1d3ab9c362bea1c6fb2c38241e5a5e9d9a5135b9 /src/private
parentaf0e5ce80abb5ebb92672541d9c9603f92e80292 (diff)
downloadboca-09134766cd1ce6d19fc77807bd52a899dde2eb05.tar.gz
boca-09134766cd1ce6d19fc77807bd52a899dde2eb05.zip
minor fixes
Diffstat (limited to 'src/private')
-rwxr-xr-xsrc/private/autojudging.php23
1 files changed, 16 insertions, 7 deletions
diff --git a/src/private/autojudging.php b/src/private/autojudging.php
index d4f9719..bda7d38 100755
--- a/src/private/autojudging.php
+++ b/src/private/autojudging.php
@@ -456,7 +456,7 @@ if($retval != 0) {
$answer = "(WHILE RUNNING) " . $answer;
break;
}
-
+ $ncor = 0;
if(is_file($dir . $ds . 'output' . $ds . $file)) {
@unlink($dir . $ds . 'compout');
$ex = escapeshellcmd($scriptcomp) ." ".
@@ -485,26 +485,27 @@ if($retval != 0) {
if($localretval < 4 || $localretval > 6) {
// contact staff
$retval = 7;
- $answer='(Contact staff)' . $answertmp;
+ $answer='(Contact staff)' . $answertmp . ' (' . $ncor . '/' . $ninputlist . ' OKs)';
break;
}
if($localretval == 6) {
$retval=$localretval;
- $answer='(Wrong answer)'. $answertmp;
+ $answer='(Wrong answer)'. $answertmp . ' (' . $ncor . '/' . $ninputlist . ' OKs)';
break;
}
if($localretval == 5) {
$retval=$localretval;
- $answer='(Presentation error)'. $answertmp;
+ $answer='(Presentation error)'. $answertmp . ' (' . $ncor . '/' . $ninputlist . ' OKs)';
} else {
if($localretval != 4) {
$retval = 7;
- $answer='(Contact staff)' . $answertmp;
+ $answer='(Contact staff)' . $answertmp . ' (' . $ncor . '/' . $ninputlist . ' OKs)';
break;
}
- if($retval == 0) {
+ $ncor++;
+ if($retval == 0 || $retval == 1) {
// YES!
- $answer='(YES)' . $answertmp;
+ $answer='(YES)' . $answertmp . ' (' . $ncor . '/' . $ninputlist . ' OKs)';
$retval = 1;
}
}
@@ -594,6 +595,14 @@ if($retval != 0) {
}
*/
}
+if($retval >= 7 && $retval <= 9) {
+ $ans = file("allout");
+ $anstmp = trim(escape_string($ans[count($ans)-1]));
+ unset($ans);
+ $answer = "(probably runtime error - unusual code: $retval) " . $anstmp;
+ // runtime error
+ $retval = 3;
+}
if($retval == 0 || $retval > 9) {
$ans = file("allout");
$anstmp = trim(escape_string($ans[count($ans)-1]));