Heeere's Plack/PSGI!

[gruntmaster-page.git] / lib / Gruntmaster / Page / St.pm

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 2100049934964b905a433176b30ca2d3502785af..97d0d065d48e3990aff57b514a553cf58020defa 100644 (file)
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -45,15 +45,15 @@ sub calc_score{
 }
 
 sub _generate{
-       my ($self, $htc, $path, $lang) = @_;
+       my ($self, $htc, $lang, $logger, $ct) = @_;
+       debug $logger => "language is '$lang' and contest is '$ct'";
        my ($totaltime, $start);
 
-       $path =~ m,^(?:ct/([^/]+)/)?,;
        local $Gruntmaster::Data::contest;
-       if ($1) {
-               $start = contest_start ($1);
-               $totaltime = contest_end ($1) - $start;
-               $Gruntmaster::Data::contest = $1;
+       if ($ct) {
+               $start = contest_start ($ct);
+               $totaltime = contest_end ($ct) - $start;
+               $Gruntmaster::Data::contest = $ct;
        }
 
        my @problems = problems;
@@ -64,8 +64,8 @@ sub _generate{
                        $tries{job_user()}{job_problem()}++;
                        $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;
                } else {
-                       if (job_result_text =~ m/^(\d+)/) {
-                               $scores{job_user()}{job_problem()} = $1;
+                       if (job_result_text =~ m/^(\scores+)/) {
+                               $scores{job_user()}{job_problem()} = $ct;
                        } else {
                                $scores{job_user()}{job_problem()} = job_result() ? 0 : 100;
                        }