X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=b204270422048e58ee57d461c324df362a509efb;hp=c359511e54b6b332d76ef899b44f1072cff2e987;hb=581c820151f988c2470c03d56dbca071432180ca;hpb=660a220456f2ce18077b86a8838259457dad38da

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index c359511..b204270 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -9,7 +9,8 @@ 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)
@@ -29,7 +30,7 @@ for my $score (@$scores) {
 	my $p = $rounds[$#rounds]->{'parallels'};
 	if ($score->{'parallel'} != $parallel) {
 		$parallel = $score->{'parallel'};
-		push @$p, { parallel => $parallel, players => [], songs => [] };
+		push @$p, { parallel => $parallel, players => [], songs => [], num_songs => 0 };
 		$player = '';
 
 		# Information on songs is not selected from roundrandomsongs etc.,
@@ -42,12 +43,13 @@ for my $score (@$scores) {
 		} else {
 			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
 		}
+		$p->[$#$p]->{'num_songs'}++;
 	}
 	
 	my $pl = $p->[$#$p]->{'players'};
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
-		push @$pl, { nick => $player, songs => [] };
+		push @$pl, { nick => $player, songs => [], total => 0 };
 
 	}
 	
@@ -56,8 +58,13 @@ for my $score (@$scores) {
 		chosen => $score->{'chosen'},
 		score => $score->{'score'}
 	};
+	$pl->[$#$pl]->{'total'} += $score->{'score'};
 }
 
 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;