From: Steinar H. Gunderson Date: Mon, 14 Feb 2005 20:35:22 +0000 (+0000) Subject: Do LEFT JOINs to get out info for unfinished groups. X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=b1e862cf469e55d500895e0a6abda81bd94cba7c;ds=sidebyside Do LEFT JOINs to get out info for unfinished groups. --- diff --git a/html/show-tournament.pl b/html/show-tournament.pl index 57bd379..30c1e51 100755 --- 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 scores NATURAL JOIN players NATURAL JOIN songs NATURAL JOIN roundparticipation WHERE tournament=? ORDER BY round,parallel,position,songnumber', + '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', $id); my @rounds = (); @@ -71,7 +71,7 @@ if ($num_rounds == 0) { my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_participants FROM tournamentparticipation WHERE tournament=?', undef, $id); $num_qualified = $ref->{'num_participants'}; } else { - my $ref = $dbh->selectrow_hashref('SELECT numqualifying FROM roundparticipation WHERE tournament=? AND round=?', undef, $id, $num_rounds); + my $ref = $dbh->selectrow_hashref('SELECT numqualifying FROM rounds WHERE tournament=? AND round=?', undef, $id, $num_rounds); $num_qualified = $ref->{'numqualifying'}; }