X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=b4b6e04b47d478161ecf202fbab859beb9975f11;hp=55bd2b4a4e9a6f85f8b695adf5e67093e656241c;hb=81edbdf60931cc5343964a86e95a43a4dfd6d103;hpb=f3e1d3c28ccb302af953bc27c303c5256cc4e60e

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index 55bd2b4..b4b6e04 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -15,7 +15,7 @@ my $rankings = ccbs::db_fetch_all($dbh, 'SELECT ranking,nick,COALESCE(points,-1)
 # 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 roundparticipation NATURAL LEFT JOIN roundrandomsongs NATURAL LEFT JOIN scores NATURAL JOIN songs NATURAL JOIN players WHERE tournament=? ORDER BY round,parallel,position,songnumber',
+	'SELECT round,parallel,position,nick,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 = ();
@@ -39,7 +39,7 @@ for my $score (@$scores) {
 	}
 	if ($score->{'position'} == 1) {
 		if ($score->{'chosen'}) {
-			push @{$p->[$#$p]->{'songs'}}, '';
+			push @{$p->[$#$p]->{'songs'}}, 'Selvvalgt';
 		} else {
 			push @{$p->[$#$p]->{'songs'}}, $score->{'title'};
 		}
@@ -50,7 +50,6 @@ for my $score (@$scores) {
 	if ($score->{'nick'} ne $player) {
 		$player = $score->{'nick'};
 		push @$pl, { nick => $player, songs => [], total => 0 };
-
 	}
 	
 	push @{$pl->[$#$pl]->{'songs'}}, {
@@ -58,7 +57,9 @@ for my $score (@$scores) {
 		chosen => $score->{'chosen'},
 		score => $score->{'score'}
 	};
-	$pl->[$#$pl]->{'total'} += $score->{'score'};
+	if (defined($score->{'score'})) {
+		$pl->[$#$pl]->{'total'} += $score->{'score'};
+	}
 }
 
 my $num_rounds = scalar @rounds;