X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=8d6dc45009d8bf8ce86652cf7fd1bb9253f1a958;hp=fe40817052edde3feeb36b22c711ea7fc864a3d5;hb=c6d4beb429904725988d107ddab644a52d217aab;hpb=ccc5e31ac4db570fce4836d6ac77d39200e19b54

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index fe40817..8d6dc45 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -9,12 +9,13 @@ my $id = $cgi->param('id');
 
 my $dbh = ccbs::db_connect();
 
-my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments WHERE tournament=?', undef, $id);
+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);
 
 # 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,nick,title,chosen,score FROM scores NATURAL JOIN players NATURAL JOIN songs NATURAL JOIN roundparticipation WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+	'SELECT round,parallel,position,nick,title,chosen,score FROM scores NATURAL JOIN players NATURAL JOIN songs NATURAL JOIN roundparticipation WHERE tournament=? ORDER BY round,parallel,position,songnumber',
 	$id);
 
 my @rounds = ();
@@ -29,13 +30,26 @@ for my $score (@$scores) {
 	my $p = $rounds[$#rounds]->{'parallels'};
 	if ($score->{'parallel'} != $parallel) {
 		$parallel = $score->{'parallel'};
-		push @$p, { parallel => $parallel, players => [] };
+		push @$p, { parallel => $parallel, players => [], songs => [] };
 		$player = '';
+
+		# 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'}}, '';
+		} else {
+			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
+		}
 	}
+	
 	my $pl = $p->[$#$p]->{'players'};
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
 		push @$pl, { nick => $player, songs => [] };
+
 	}
 	
 	push @{$pl->[$#$pl]->{'songs'}}, {
@@ -46,4 +60,9 @@ for my $score (@$scores) {
 }
 
 ccbs::print_header();
-ccbs::process_template('show-tournament.tmpl', 'Turnering', { tournament => $tournament, rounds => \@rounds });
+ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, {
+	tournament => $tournament,
+	rankings => $rankings,
+	rounds => \@rounds
+});
+$dbh->disconnect;