X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FPage%2FSt.pm;h=6486136cb09d362b6c0cd2f14294ba748c18217d;hb=e4f75084cfd962326c47b09173c92df2fe47fbf4;hp=2100049934964b905a433176b30ca2d3502785af;hpb=a90230ea14d4f5e2c93528830deed883d5afdbc2;p=gruntmaster-page.git

diff --git a/lib/Gruntmaster/Page/St.pm b/lib/Gruntmaster/Page/St.pm
index 2100049..6486136 100644
--- a/lib/Gruntmaster/Page/St.pm
+++ b/lib/Gruntmaster/Page/St.pm
@@ -7,23 +7,6 @@ use Gruntmaster::Page::Base st => 'Standings';
 our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use constant TEMPLATES => {
-	en => <<'HTML',
-<table border>
-<thead>
-<tmpl_if problems><tr><th>Username<tmpl_loop problems><th><tmpl_var _></tmpl_loop><th>Total
-<tmpl_else><tr><th>Username<th>Score
-</tmpl_if>
-
-<tbody>
-<tmpl_loop st><tr><td><tmpl_var user>
-<tmpl_if problems><tmpl_loop scores><td><tmpl_var _>
-</tmpl_loop></tmpl_if><td><tmpl_var score>
-</tmpl_loop>
-</table>
-HTML
-};
-
 use constant LEVEL_VALUES => {
 	beginner => 100,
 	easy => 250,
@@ -45,15 +28,15 @@ sub calc_score{
 }
 
 sub _generate{
-	my ($self, $htc, $path, $lang) = @_;
+	my ($self, $htc, $lang, $env, $ct) = @_;
+	debug $env => "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;
@@ -61,18 +44,17 @@ sub _generate{
 	my (%scores, %tries);
 	for (1 .. jobcard) {
 		if ($Gruntmaster::Data::contest) {
-			$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;
+			$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;
 			}
 		}
 	}
 
-	my @st = sort { $b->{score} <=> $a->{score} } map {
+	my @st = sort { $b->{score} <=> $a->{score} or $a->{user} cmp $b->{user}} map {
 		my $user = $_;
 		+{
 			user => $user,
@@ -81,6 +63,9 @@ sub _generate{
 			problems => $Gruntmaster::Data::contest,
 		}
 	} keys %scores;
+
+	$st[0]->{rank} = 1;
+	$st[$_]->{rank} = $st[$_ - 1]->{rank} + ($st[$_]->{score} < $st[$_ - 1]->{score}) for 1 .. $#st;
 	$htc->param(problems => [map { problem_name } @problems ]) if $Gruntmaster::Data::contest;
 	$htc->param(st => \@st);
 }