# 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 = ();
if ($score->{'nick'} ne $player) {
$player = $score->{'nick'};
push @$pl, { nick => $player, songs => [], total => 0 };
-
}
push @{$pl->[$#$pl]->{'songs'}}, {
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;
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 rounds WHERE tournament=? AND round=?', undef, $id, $num_rounds);
+ my $ref = $dbh->selectrow_hashref('SELECT SUM(numqualifying) AS numqualifying FROM rounds NATURAL JOIN groups WHERE tournament=? AND round=?', undef, $id, $num_rounds);
$num_qualified = $ref->{'numqualifying'};
}