X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=9db40c4da7f9d17fe6a9e84d2a5d8de5c4721a52;hp=3a407f80e99dafa1848bcc03c697f261179c7940;hb=dd28e295d7cc627fea49ed1579ab689e17bca915;hpb=49e5792858da785cf814fe529b6e9ddbfb326595 diff --git a/html/show-tournament.pl b/html/show-tournament.pl index 3a407f8..9db40c4 100755 --- a/html/show-tournament.pl +++ b/html/show-tournament.pl @@ -10,7 +10,14 @@ my $id = $cgi->param('id'); my $dbh = ccbs::db_connect(); my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN seasons NATURAL JOIN countries NATURAL JOIN machines NATURAL JOIN scoringsystems WHERE tournament=?', undef, $id); -my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1) AS points FROM tournamentrankings NATURAL JOIN players WHERE tournament=? ORDER BY ranking', $id); + +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); +} 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); +} + my $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'}); # Check if the last round is valid for closing (by checking if all scores @@ -24,11 +31,28 @@ if ($ref->{'num_incomplete'} == 0) { $closing_valid = 0; } +# Check if this tournament is on the bigscreen or not. +my $ref = $dbh->selectrow_hashref('SELECT * FROM bigscreen.active_tournament'); +my $bigscreen = ($ref->{'tournament'} == $id) ? 1 : 0; + +my $active_groups; +if ($bigscreen) { + # Find all groups currently shown on the bigscreen. + $active_groups = ccbs::db_fetch_all($dbh, 'SELECT * FROM bigscreen.active_groups WHERE tournament=?', $id); +} + # 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,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', +my $scores; +if ($tournament->{'country'} == 1) { + $scores = ccbs::db_fetch_all($dbh, + 'SELECT round,parallel,position,playmode,difficulty,songnumber,player,nick || \' (\' || countrycode::varchar || \')\' AS nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN countries NATURAL JOIN scores NATURAL LEFT JOIN songs WHERE tournament=? ORDER BY round,parallel,position,songnumber', + $id); +} else { + $scores = ccbs::db_fetch_all($dbh, + 'SELECT round,parallel,position,playmode,difficulty,songnumber,player,COALESCE(nick || \' (\' || clubcode::varchar || \')\', nick) AS nick,song,title,chosen,score FROM roundparticipation NATURAL JOIN players NATURAL JOIN scores NATURAL LEFT JOIN songs NATURAL LEFT JOIN clubs WHERE tournament=? ORDER BY round,parallel,position,songnumber', $id); +} my @rounds = (); @@ -45,15 +69,26 @@ for my $score (@$scores) { push @$p, { parallel => $parallel, players => [], songs => [], num_songs => 0 }; $player = ''; + if ($bigscreen) { + # suboptimal, but heck :-) + $p->[$#$p]->{'bigscreen'} = 0; + for my $ag (@$active_groups) { + if ($ag->{'round'} == $round && $ag->{'parallel'} == $parallel) { + $p->[$#$p]->{'bigscreen'} = 1; + last; + } + } + } + # Information on songs is not selected from roundrandomsongs etc., # but is filled in the first time the song is seen for this round # (ie. below) } if ($score->{'position'} == 1) { if ($score->{'chosen'}) { - push @{$p->[$#$p]->{'songs'}}, ''; + push @{$p->[$#$p]->{'songs'}}, { song => -1, title => '' }; } else { - push @{$p->[$#$p]->{'songs'}}, $score->{'title'}; + push @{$p->[$#$p]->{'songs'}}, $score; } $p->[$#$p]->{'num_songs'}++; } @@ -61,9 +96,9 @@ for my $score (@$scores) { my $pl = $p->[$#$p]->{'players'}; if ($score->{'nick'} ne $player) { $player = $score->{'nick'}; - push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0 }; + push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0, rank => 1 }; } - + push @{$pl->[$#$pl]->{'songs'}}, $score; if (defined($score->{'score'})) { @@ -71,6 +106,24 @@ for my $score (@$scores) { } } +# Find the rank of all the players in every group, via simple insertion-like +# sort +for my $r (@rounds) { + for my $p (@{$r->{'parallels'}}) { + my $pls = $p->{'players'}; + for my $i (0..$#$pls) { + my $rank = 1; + for my $j (0..($i-1)) { + if ($pls->[$i]->{'total'} < $pls->[$j]->{'total'}) { + $pls->[$i]->{'rank'}++; + } elsif ($pls->[$i]->{'total'} > $pls->[$j]->{'total'}) { + $pls->[$j]->{'rank'}++; + } + } + } + } +} + # FIXME: In some odd cases, there _might_ be an empty group right at the end. Fix this when # we are able to add/delete people in groups. @@ -84,7 +137,7 @@ for my $r (0..$#rounds-1) { # If there's only one group left and it's valid for closing, we can also finish # the entire tournament if we'd like -if ($closing_valid && (scalar @{$rounds[$#rounds]->{'parallels'}}) == 1) { +if ($closing_valid && (scalar @rounds > 0 && scalar @{$rounds[$#rounds]->{'parallels'}}) == 1) { $finishing_valid = 1; } @@ -99,6 +152,16 @@ if ($num_rounds == 0) { $num_qualified = $ref->{'numqualifying'}; } +# And last: If there is a ranking list, the tournament is closed and we really can't +# do anything more +if ($num_rankings > 0) { + $closing_valid = 0; + $finishing_valid = 0; + if ($#rounds > -1) { + $rounds[$#rounds]->{'locked'} = 1; + } +} + ccbs::print_header(); ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, { tournament => $tournament, @@ -109,6 +172,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, num_qualified => $num_qualified, songs => $songs, closing_valid => $closing_valid, - finishing_valid => $finishing_valid + finishing_valid => $finishing_valid, + bigscreen => $bigscreen }); $dbh->disconnect;