From: Marius Gavrilescu Date: Sat, 15 Feb 2014 20:01:08 +0000 (+0200) Subject: Improve standings code X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=1c0a51676138d88706e13a41746a7c91c53d75b5;p=gruntmaster-page.git Improve standings code --- diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm index 6486136..02e377d 100644 --- 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) } }