Fix bug where showing of an empty tournament would crash.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index fd78a3c72f5c00d658b3e782f5f3f00c38713fd2..66045290975b347a0b33b8f458595be924846429 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -16,7 +16,7 @@ my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURA
 # Swoop all the data in in a big join, then order it over to quasi-sane Perl objects.
 # (round -> parallel -> player -> songs -> title,chosen,score)
 my $scores = ccbs::db_fetch_all($dbh,
-       'SELECT round,parallel,position,playmode,difficulty,songnumber,nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+       'SELECT round,parallel,position,playmode,difficulty,songnumber,player,nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber',
        $id);
 
 my @rounds = ();
@@ -25,7 +25,7 @@ my ($round, $parallel, $player) = (-1,-1,'');
 for my $score (@$scores) {
        if ($score->{'round'} != $round) {
                $round = $score->{'round'};
-               push @rounds, { round => $round, parallels => [] };
+               push @rounds, { round => $round, parallels => [], locked => 0 };
                $parallel = -1;
        }
        my $p = $rounds[$#rounds]->{'parallels'};
@@ -50,21 +50,24 @@ for my $score (@$scores) {
        my $pl = $p->[$#$p]->{'players'};
        if ($score->{'nick'} ne $player) {
                $player = $score->{'nick'};
-               push @$pl, { nick => $player, songs => [], total => 0, locked => 1 };
+               push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 };
        }
        
        push @{$pl->[$#$pl]->{'songs'}}, $score;
 
        if (defined($score->{'score'})) {
                $pl->[$#$pl]->{'total'} += $score->{'score'};
-       } else {
-               $pl->[$#$pl]->{'locked'} = 0;
        }
 }
 
 my $num_rounds = scalar @rounds;
 my $num_rankings = scalar @$rankings;
 
+# Lock all rounds but the last (active?) one
+for my $r (0..$#rounds-1) {
+       $rounds[$r]->{'locked'} = 1;
+}
+
 # If there have been no rounds, check out the number of participants; if not, check the
 # number of qualified from the last round
 my $num_qualified;