X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Findex.pl;h=a01f514c25e50dd95cc6a481b317245bb653d619;hb=f099d75a86d13fe5696ac4c055fcf82149dc31b6;hp=0bf35594f8e385c7878badb0b6678c4b012e1124;hpb=79ca58ab629b09e8fe59415578d2ee1ea5cb2079;p=wloh

diff --git a/www/index.pl b/www/index.pl
index 0bf3559..a01f514 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -243,7 +243,7 @@ sub make_table {
 				push @player_ranks, {
 					'td/style' => "background-color: rgb($r, $g, $b)",
 					'a' => sprintf("%.1f%%", $pn * 100.0),
-					'a/href' => "javascript:showScenario('$table_id', '/$locale/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i"
+					'a/href' => "javascript:showScenario('$table_id', '/$locale/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i')"
 				};
 			}
 		}
@@ -356,7 +356,6 @@ get_players_and_ratings($dbh, $locale, $season, $division, $subdivision);
 my $cov = get_covariance_matrix($dbh, keys %players);
 
 if (defined($match_player) && defined($match_position)) {
-	print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning');
 	my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, \%ratings, $cov);
 
 	--$match_player;
@@ -368,7 +367,11 @@ if (defined($match_player) && defined($match_position)) {
 	while (<MCCALC>) {
 		/(\d+) (\d+) (-?\d+)/ or next;
 		chomp;
-		push @scenario, [ $1, $2, $3 ];
+		push @scenario, {
+			'player-1' => $players{$1},
+			'player-2' => $players{$2},
+			'result' => sprintf("%+d", $3),
+		};
 	}
 	close MCCALC;
 	unlink $tmpnam;
@@ -377,18 +380,19 @@ if (defined($match_player) && defined($match_position)) {
 	my $player_name = $players{$sorted_players[$match_player]};
 
 	if (scalar @scenario == 0) {
-		printf "    <p>Fant ingen m&aring;te <strong>%s</strong> kan ende p&aring; <strong>%d.</strong> plass p&aring;.</p>\n",
-			$player_name, ($match_position + 1);
+		print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m');
+		wloh_common::process_template('scenario-not-found.xml', {
+			'#nick' => $player_name,
+			'#rank' => sprintf("%d.", $match_position + 1)
+		});
 	} else {
-		printf "    <p>Scenario der <strong>%s</strong> ender p&aring; <strong>%d.</strong> plass:</p>\n",
-			$player_name, ($match_position + 1);
-		print "    <ul>\n";
-		for my $m (@scenario) {
-			printf "    <li>%s &ndash; %s: %+d</li>\n", $players{$m->[0]}, $players{$m->[1]}, $m->[2];
-		}
-		print "    </ul>\n";
+		print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m');
+		wloh_common::process_template('scenario.xml', {
+			'#nick' => $player_name,
+			'#rank' => sprintf("%d.", $match_position + 1),
+			'#results' => \@scenario
+		});
 	}
-	print_footer();
 } else {
 	POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');