X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=61c3badf7226c2d285226a0da8be07e54dc2e853;hp=3a407f80e99dafa1848bcc03c697f261179c7940;hb=a6500d8a7d1a7fc0bd172373f1a670b8ee7ce92e;hpb=49e5792858da785cf814fe529b6e9ddbfb326595

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 3a407f8..61c3bad 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -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.
 
@@ -84,7 +102,7 @@ for my $r (0..$#rounds-1) {
 
 # If there's only one group left and it's valid for closing, we can also finish
 # the entire tournament if we'd like
-if ($closing_valid && (scalar @{$rounds[$#rounds]->{'parallels'}}) == 1) {
+if ($closing_valid && (scalar @rounds > 0 && scalar @{$rounds[$#rounds]->{'parallels'}}) == 1) {
 	$finishing_valid = 1;
 }
 
@@ -99,6 +117,14 @@ if ($num_rounds == 0) {
 	$num_qualified = $ref->{'numqualifying'};
 }
 
+# And last: If there is a ranking list, the tournament is closed and we really can't
+# do anything more
+if ($num_rankings > 0) {
+	$closing_valid = 0;
+	$finishing_valid = 0;
+	$rounds[$#rounds]->{'locked'} = 1;
+}
+
 ccbs::print_header();
 ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
 	tournament => $tournament,