X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=ab58b647f476c7bd04f2e606c3d75ce3592b19e2;hb=fec946b9a1cd41abf89a8fd83312d0cd9cd2688c;hp=9db40c4da7f9d17fe6a9e84d2a5d8de5c4721a52;hpb=dd28e295d7cc627fea49ed1579ab689e17bca915;p=ccbs diff --git a/html/show-tournament.pl b/html/show-tournament.pl index 9db40c4..ab58b64 100755 --- a/html/show-tournament.pl +++ b/html/show-tournament.pl @@ -13,9 +13,9 @@ my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN my $rankings; if ($tournament->{'country'} == 1) { - $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick || \' (\' || countrycode::varchar || \')\' AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL JOIN countries WHERE tournament=? ORDER BY ranking', $id); + $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,player,nick || \' (\' || countrycode::varchar || \')\' AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL JOIN countries WHERE tournament=? ORDER BY ranking', $id); } else { - $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,COALESCE(nick || \' (\' || clubcode::varchar || \')\', nick) AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL LEFT JOIN clubs WHERE tournament=? ORDER BY ranking', $id); + $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,player,COALESCE(nick || \' (\' || clubcode::varchar || \')\', nick) AS nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players NATURAL LEFT JOIN clubs WHERE tournament=? ORDER BY ranking', $id); } my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'});