X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=3d0db3c945f38c8bb363b93362b30d20637e329e;hp=0a59d71c9af14cfa0cd5c81386990730a42381ab;hb=06e66c13cdac696e02006b40681cbcf681704670;hpb=fc928636e25aef2346993efdbccf9badc4f7bcdd

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 0a59d71..3d0db3c 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -51,9 +51,9 @@ for my $score (@$scores) {
 	}
 	if ($score->{'position'} == 1) {
 		if ($score->{'chosen'}) {
-			push @{$p->[$#$p]->{'songs'}}, '';
+			push @{$p->[$#$p]->{'songs'}}, { song => -1, title => '' };
 		} else {
-			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
+			push @{$p->[$#$p]->{'songs'}}, $score;
 		}
 		$p->[$#$p]->{'num_songs'}++;
 	}
@@ -61,9 +61,9 @@ for my $score (@$scores) {
 	my $pl = $p->[$#$p]->{'players'};
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
-		push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 };
+		push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0, rank => 1 };
 	}
-	
+
 	push @{$pl->[$#$pl]->{'songs'}}, $score;
 
 	if (defined($score->{'score'})) {
@@ -71,6 +71,24 @@ for my $score (@$scores) {
 	}
 }
 
+# Find the rank of all the players in every group, via simple insertion-like
+# sort
+for my $r (@rounds) {
+	for my $p (@{$r->{'parallels'}}) {
+		my $pls = $p->{'players'};
+		for my $i (0..$#$pls) {
+			my $rank = 1;
+			for my $j (0..($i-1)) {
+				if ($pls->[$i]->{'total'} < $pls->[$j]->{'total'}) {
+					$pls->[$i]->{'rank'}++;
+				} elsif ($pls->[$i]->{'total'} > $pls->[$j]->{'total'}) {
+					$pls->[$j]->{'rank'}++;
+				}
+			}
+		}
+	}
+}
+
 # FIXME: In some odd cases, there _might_ be an empty group right at the end. Fix this when
 #        we are able to add/delete people in groups.