X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=fa95fb4d67a86d8443602c9e432c2d462ec93199;hp=fd78a3c72f5c00d658b3e782f5f3f00c38713fd2;hb=50e6991fc69f8bace6489c40dbbe6b5ba9df8572;hpb=abdecc0f519228843c82f803158a82771ab30f05 diff --git a/html/show-tournament.pl b/html/show-tournament.pl index fd78a3c..fa95fb4 100755 --- 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 = (); @@ -50,7 +50,7 @@ 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, locked => 1 }; } push @{$pl->[$#$pl]->{'songs'}}, $score;