X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=fa95fb4d67a86d8443602c9e432c2d462ec93199;hp=57bd379a16f2a68df1b2430f4bc619e84e7754a7;hb=0f7fc7ef67f2e6f97fedce37e9097356bf8f9233;hpb=54911b5a3fc854f29196895b5820ad6091001427

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 57bd379..fa95fb4 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -11,11 +11,12 @@ 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 $songs = ccbs::db_fetch_all($dbh, 'SELECT song,title FROM machinesongs NATURAL JOIN songs WHERE machine=? ORDER BY LOWER(title)', $tournament->{'machine'});
 
 # 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,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,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',
 	$id);
 
 my @rounds = ();
@@ -49,16 +50,16 @@ for my $score (@$scores) {
 	my $pl = $p->[$#$p]->{'players'};
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
-		push @$pl, { nick => $player, songs => [], total => 0 };
-
+		push @$pl, { player => $score->{'player'}, nick => $player, songs => [], total => 0, locked => 1 };
 	}
 	
-	push @{$pl->[$#$pl]->{'songs'}}, {
-		title => $score->{'title'},
-		chosen => $score->{'chosen'},
-		score => $score->{'score'}
-	};
-	$pl->[$#$pl]->{'total'} += $score->{'score'};
+	push @{$pl->[$#$pl]->{'songs'}}, $score;
+
+	if (defined($score->{'score'})) {
+		$pl->[$#$pl]->{'total'} += $score->{'score'};
+	} else {
+		$pl->[$#$pl]->{'locked'} = 0;
+	}
 }
 
 my $num_rounds = scalar @rounds;
@@ -71,7 +72,7 @@ if ($num_rounds == 0) {
 	my $ref = $dbh->selectrow_hashref('SELECT COUNT(*) AS num_participants FROM tournamentparticipation WHERE tournament=?', undef, $id);
 	$num_qualified = $ref->{'num_participants'};
 } else {
-	my $ref = $dbh->selectrow_hashref('SELECT numqualifying FROM roundparticipation WHERE tournament=? AND round=?', undef, $id, $num_rounds);
+	my $ref = $dbh->selectrow_hashref('SELECT SUM(numqualifying) AS numqualifying FROM rounds NATURAL JOIN groups WHERE tournament=? AND round=?', undef, $id, $num_rounds);
 	$num_qualified = $ref->{'numqualifying'};
 }
 
@@ -82,6 +83,7 @@ ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'},
 	num_rankings => $num_rankings,
 	rounds => \@rounds,
 	num_rounds => $num_rounds,
-	num_qualified => $num_qualified
+	num_qualified => $num_qualified,
+	songs => $songs
 });
 $dbh->disconnect;