Split chosen songs into two table cells.

[ccbs] / html / show-tournament.pl

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 8ff04c347c9e22a703691f79167e6b2495a28143..5a98ff85436e520a8bea7dc7744375edc7009e3c 100755 (executable)
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -15,7 +15,7 @@ my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1)
 # 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,nick,title,chosen,score FROM roundparticipation NATURAL LEFT JOIN roundrandomsongs NATURAL LEFT JOIN scores NATURAL JOIN songs NATURAL JOIN players WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+       'SELECT round,parallel,position,nick,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 = ();
@@ -57,7 +57,9 @@ for my $score (@$scores) {
                chosen => $score->{'chosen'},
                score => $score->{'score'}
        };
-       $pl->[$#$pl]->{'total'} += $score->{'score'};
+       if (defined($score->{'score'})) {
+               $pl->[$#$pl]->{'total'} += $score->{'score'};
+       }
 }
 
 my $num_rounds = scalar @rounds;