X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=97d0d065d48e3990aff57b514a553cf58020defa;hb=7dc3247307f2e86af154dc449224f22ba8923c79;hp=2100049934964b905a433176b30ca2d3502785af;hpb=e9e5c8a440a6e3a088a4b9330650e310561ef518;p=plack-app-gruntmaster.git

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 2100049..97d0d06 100644
--- 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;
 			}