X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=html%2Fsongs.pl;h=2ac52a1adfcdeac2231cae2532fb77e609b7c206;hb=4ec56eb697ccac7f05591670a47dade0aae3f7ee;hp=80c6132ba7b89886e17a462792dd93806a347f1b;hpb=fd8dfbadf8a67d95e17a5aae2364c64c81095b0c;p=ccbs

diff --git a/html/songs.pl b/html/songs.pl
index 80c6132..2ac52a1 100755
--- a/html/songs.pl
+++ b/html/songs.pl
@@ -9,7 +9,7 @@ my $id = $cgi->param('id');
 
 my $dbh = ccbs::db_connect();
 
-my $songs = ccbs::db_fetch_all($dbh, 'SELECT machinename,song,title,artist,avg_score,stddev_score,high_score,high_score_player,high_score_nick FROM machinesongs NATURAL JOIN songs NATURAL JOIN machines NATURAL LEFT JOIN ( SELECT song,AVG(score)::integer AS avg_score,STDDEV(score)::integer AS stddev_score FROM scores JOIN tournaments ON scores.tournament=tournaments.tournament WHERE scoringsystem=1 GROUP BY song ) t1 NATURAL LEFT JOIN ( SELECT DISTINCT ON (song) song,player AS high_score_player,nick AS high_score_nick,score AS high_score FROM scores NATURAL JOIN players JOIN tournaments ON scores.tournament=tournaments.tournament WHERE scoringsystem=1 ORDER BY song,score DESC ) t2 ORDER BY machine,LOWER(title)');
+my $songs = ccbs::db_fetch_all($dbh, 'SELECT machine,machinename,song,title,artist,avg_score,stddev_score,high_score,high_score_player,high_score_nick FROM machinesongs NATURAL JOIN songs NATURAL JOIN machines NATURAL LEFT JOIN ( SELECT song,AVG(score)::integer AS avg_score,STDDEV(score)::integer AS stddev_score FROM scores JOIN tournaments ON scores.tournament=tournaments.tournament WHERE scoringsystem=1 GROUP BY song ) t1 NATURAL LEFT JOIN ( SELECT DISTINCT ON (song) song,player AS high_score_player,nick AS high_score_nick,score AS high_score FROM scores NATURAL JOIN players JOIN tournaments ON scores.tournament=tournaments.tournament WHERE scoringsystem=1 ORDER BY song,score DESC ) t2 ORDER BY machine,LOWER(title)');
 
 ccbs::print_header();
 ccbs::process_template('songs.tmpl', 'Sanger', {