Changeset 1046

Timestamp:

06/21/09 14:19:51 (3 years ago)

Author:

bogdan2412

Message:

Merge changes from eval

Fixes virtual contest task hideing issues and eval hanging on jobs with no rounds.

Location:

trunk

Files:

• common/round.php (modified) (3 diffs)
• common/score.php (modified) (1 diff)
• eval/utilities.php (modified) (2 diffs)

trunk/common/round.php

@@ -134 +134 @@
     $round['state'] = 'running';
     round_update($round);
-    round_unhide_all_tasks($round['id']);
+    // User defined rounds always contain already visible tasks.
+    if ($round["type"] != "user-defined") {
+        round_unhide_all_tasks($round['id']);
+    }
 }
 
@@ -142 +145 @@
     log_print("CONTEST LOGIC: Stopping round {$round['id']}.");
     $round['state'] = 'complete';
-    $round['public_eval'] = 1;
+    // Results should be immediately visible after a round ends
+    // if it's type is not classic.
+    if ($round["type"] != "classic") {
+        $round['public_eval'] = 1;
+    }
     round_update($round);
 }
@@ -152 +159 @@
     $round['state'] = 'waiting';
     round_update($round);
-    round_hide_all_tasks($round['id']);
+    // User defined rounds always contain already visible tasks.
+    // If such a round is postponed, do not (re)hide the tasks
+    // like for classic rounds, where the tasks are not visible
+    // before the round starts.
+    if ($round["type"] != "user-defined") {
+        round_hide_all_tasks($round['id']);
+    }
 }
 

trunk/common/score.php

@@ -7 +7 @@
 function score_update_for_job($score, $time, $user_id, $task_id, $round_id)
 {
-    $round = round_get($round_id);
-    round_event_job_score($round, $score, $time, $user_id, $task_id);
+    if ($round_id) {
+        $round = round_get($round_id);
+        round_event_job_score($round, $score, $time, $user_id, $task_id);
+    }
 }
 

trunk/eval/utilities.php

@@ -82 +82 @@
 {
     if (!preg_match("/^(ERROR|FAIL|OK):\ (.*)$/", $message, $matches)) {
+        log_warn("Invalid jrun output: $message");
         return false;
     }
@@ -161 +162 @@
     //$cmdline .= " --verbose";
 
-    //log_print("Running $cmdline");
+    log_print("Running $cmdline");
     $message = shell_exec($cmdline);