X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fplayer.pl;h=80011b0d6ba0c0b1acea1e226d95e81b276e3f17;hp=0fbde00f445ba54436b7951367fe931c746bc722;hb=7b746dbde2f6ca885b27056df96cd028b805bb1c;hpb=4a2f33b86e70f2270906265751131161ba114f36 diff --git a/html/player.pl b/html/player.pl index 0fbde00..80011b0 100755 --- a/html/player.pl +++ b/html/player.pl @@ -15,13 +15,14 @@ my $bestsongs = ccbs::db_fetch_all($dbh, 'SELECT song,title,score,tournament,tou # Fetch all scores and count a bit my $columns = 0; my @allsongs = (); -my $last_title = undef; +my $last_song = undef; -my $scores = ccbs::db_fetch_all($dbh, 'SELECT title,score FROM scores NATURAL JOIN songs WHERE player=? ORDER BY title,score DESC', $id); +my $scores = ccbs::db_fetch_all($dbh, 'SELECT song,title,score FROM scores NATURAL JOIN songs WHERE player=? ORDER BY title,score DESC', $id); for my $score (@$scores) { - my $title = $score->{'title'}; - if (!defined($last_title) || $title ne $last_title) { - push @allsongs, { title => $title, scores => [] }; + my $song = $score->{'song'}; + + if (!defined($last_song) || $song != $last_song) { + push @allsongs, { song => $song, title => $score->{'title'}, scores => [] }; } push @{$allsongs[$#allsongs]->{'scores'}}, $score->{'score'}; @@ -29,11 +30,11 @@ for my $score (@$scores) { my $this_columns = scalar @{$allsongs[$#allsongs]->{'scores'}}; $columns = $this_columns if ($this_columns > $columns); - $last_title = $title; + $last_song = $song; } ccbs::print_header(); -ccbs::process_template('player.tmpl', $player->{'title'}, { +ccbs::process_template('player.tmpl', $player->{'nick'}, { player => $player, bestsongs => $bestsongs, allsongs => \@allsongs,