X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=9db40c4da7f9d17fe6a9e84d2a5d8de5c4721a52;hp=602e5cb1696c1230f36fc457dbe3091666ea3c4e;hb=dd28e295d7cc627fea49ed1579ab689e17bca915;hpb=9e9a178da172bb8cacb39b308eb965cd6f23a40c

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 602e5cb..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,14 +31,28 @@ if ($ref->{'num_incomplete'} == 0) {
 	$closing_valid = 0;
 }
 
-# Find all rounds currently shown on the bigscreen.
-my $active_rounds = $dbh->selectall_hashref('SELECT round FROM bigscreen.active_rounds WHERE tournament=?', 'round', undef, $id);
+# 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 = ();
 
@@ -41,12 +62,6 @@ for my $score (@$scores) {
 		$round = $score->{'round'};
 		push @rounds, { round => $round, parallels => [], locked => 0 };
 		$parallel = -1;
-
-		if (defined($active_rounds->{$round})) {
-			$rounds[$#rounds]->{'bigscreen'} = 1;
-		} else {
-			$rounds[$#rounds]->{'bigscreen'} = 0;
-		}
 	}
 	my $p = $rounds[$#rounds]->{'parallels'};
 	if ($score->{'parallel'} != $parallel) {
@@ -54,6 +69,17 @@ 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)
@@ -131,7 +157,9 @@ if ($num_rounds == 0) {
 if ($num_rankings > 0) {
 	$closing_valid = 0;
 	$finishing_valid = 0;
-	$rounds[$#rounds]->{'locked'} = 1;
+	if ($#rounds > -1) {
+		$rounds[$#rounds]->{'locked'} = 1;
+	}
 }
 
 ccbs::print_header();
@@ -144,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;