Improve standings code

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 6486136cb09d362b6c0cd2f14294ba748c18217d..02e377da57baad96bdaf98932da3f3501c007c55 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -43,14 +43,15 @@ sub _generate{
        @problems = sort @problems;
        my (%scores, %tries);
        for (1 .. jobcard) {
+               next unless defined job_user && defined job_problem && defined job_result;
+               next if $Gruntmaster::Data::contest && job_date() < $start;
+
                if ($Gruntmaster::Data::contest) {
-                       $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}++, $totaltime) if job_date() > $start;
-               } elsif (defined job_user && defined job_problem && defined job_result) {
-                       if (defined job_result_text && job_result_text =~ m/^(\scores+)/) {
-                               $scores{job_user()}{job_problem()} = $ct;
-                       } else {
-                               $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
-                       }
+                       $scores{job_user()}{job_problem()} = job_result() ? 0 : calc_score (job_user(), job_problem(), job_date(), $tries{job_user()}{job_problem()}, $totaltime);
+                       $tries{job_user()}{job_problem()}++;
+               } else {
+                       no warnings 'numeric';
+                       $scores{job_user()}{job_problem()} = 0 + job_result_text() || (job_result() ? 0 : 100)
                }
        }