From af925fb218e7a333759eb49c667bfb22eb71196d Mon Sep 17 00:00:00 2001 From: Cassio de Campos Date: Fri, 4 Aug 2017 14:20:51 +0100 Subject: bug fixes --- src/frun.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/frun.php') diff --git a/src/frun.php b/src/frun.php index 359b395..34bfd83 100644 --- a/src/frun.php +++ b/src/frun.php @@ -481,7 +481,7 @@ function DBUpdateRunAutojudging($contest, $site, $number, $ip, $answer, $stdout, $b = DBSiteInfo($contest, $site, $c); - if($b["siteautojudge"]!="t") { + if($b["siteautojudge"]!="t") { // && $retval != 1 && $retval != 6) { //cassiopc incluir automatic judging of some codes 1:YES WA:6 DBExec($c, "commit work", "DBUpdateRunAutojudging(commit)"); LOGLevel("Autojudging answered a run (run=$number, site=$site, contest=$contest, answer='$answer', retval=$retval)", 3); return true; @@ -753,7 +753,14 @@ function DBNewRun($param,$c=null) { return 0; } } else { + $b = DBSiteInfo($contest, $site, $c); $dif = $rundatediff; + if ($dif >= $b['siteduration']) { + DBExec($c, "rollback work", "DBNewRun(rollback-over)"); + LOGError("Tried to submit a run but the contest is over. SQL=(" . $sql . ")"); + MSGError("The contest is over!"); + return 0; + } } if($updatetime > $t || $insert) { -- cgit v1.2.3 From 1b7b246455f8309e8d605cfd2caec5e00bb4bde4 Mon Sep 17 00:00:00 2001 From: Cassio de Campos Date: Fri, 4 Aug 2017 16:41:43 +0100 Subject: small fixes --- src/frun.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/frun.php') diff --git a/src/frun.php b/src/frun.php index 34bfd83..5576bcd 100644 --- a/src/frun.php +++ b/src/frun.php @@ -753,14 +753,17 @@ function DBNewRun($param,$c=null) { return 0; } } else { - $b = DBSiteInfo($contest, $site, $c); - $dif = $rundatediff; - if ($dif >= $b['siteduration']) { - DBExec($c, "rollback work", "DBNewRun(rollback-over)"); - LOGError("Tried to submit a run but the contest is over. SQL=(" . $sql . ")"); - MSGError("The contest is over!"); - return 0; - } + //cassiopc: so we let the run enter the system if it comes with a defined timestamp, but it is to decide later if it will be counted... + //$b = DBSiteInfo($contest, $site, $c); + $dif = $rundatediff; + /* + if ($dif >= $b['siteduration']) { + DBExec($c, "rollback work", "DBNewRun(rollback-over)"); + LOGError("Tried to submit a run but the contest is over. SQL=(" . $sql . ")"); + MSGError("The contest is over!"); + return 0; + } + */ } if($updatetime > $t || $insert) { -- cgit v1.2.3 From 94c6cd12dacf9de46051c57e6f6bf216e86c8df8 Mon Sep 17 00:00:00 2001 From: Cassio de Campos Date: Wed, 9 Aug 2017 13:10:10 +0100 Subject: new langs, new answer, fix for automatic --- src/frun.php | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/frun.php') diff --git a/src/frun.php b/src/frun.php index 5576bcd..eb5d33f 100644 --- a/src/frun.php +++ b/src/frun.php @@ -512,6 +512,17 @@ function DBGiveUpRunAutojudging($contest, $site, $number, $ip="", $ans="") { } $a = DBRow($r,0); $t = time(); + + $b = DBSiteInfo($contest, $site, $c); + if($b["siteautojudge"]=="t") { + if(DBUpdateRunO($contest, $site, $a["usernumber"], $site, $number, 7, $c)==false) { // 7 means contact staff + DBExec($c, "rollback work", "DBGiveUpRunAutojudging(rollback auto)"); + LOGError("Unable to automatically update a run answer (run=$number, site=$site, ". + "contest=$contest, answer='$ans', retval=7)"); + return false; + } + LOGLevel("Autojudging automatically answered a run (run=$number, site=$site, contest=$contest, retval=7, answer='$ans')", 3); + } if($ip=="") { DBExec($c, "update runtable set autoenddate=null, autoanswer=null, autostdout=null, autostderr=null, " . -- cgit v1.2.3