# 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 = ();
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, locked => 1 };
}
push @{$pl->[$#$pl]->{'songs'}}, $score;