X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Fassess-single.pl;h=1d5cf563544f1554a7b247f1cc2188a1fdbde2f6;hb=1f8489da48b9721d9c44b97749078a94b935a7b2;hp=c2948ff369e1aa1fef9707ad94b80e3899c576a7;hpb=6b71fbcb1949c150dcc8f50bd9f138f56454964c;p=foosball

diff --git a/www/assess-single.pl b/www/assess-single.pl
old mode 100644
new mode 100755
index c2948ff..1d5cf56
--- a/www/assess-single.pl
+++ b/www/assess-single.pl
@@ -24,17 +24,33 @@ my $dbh = foosball::db_connect();
 my ($rating1, $rd1) = foosball::find_single_rating($dbh, $username1);
 my ($rating2, $rd2) = foosball::find_single_rating($dbh, $username2);
 
-open ASSESS, "/srv/foosball.sesse.net/foosrank $rating1 $rd1 $rating2 $rd2 |"
+# 10-x table
+open ASSESS, "/srv/foosball.sesse.net/foosrank $rating1 $rd1 $rating2 $rd2 10 |"
 	or die "foosrank: $!";
 
-my @results = ();
+my @results10 = ();
 while (<ASSESS>) {
 	my ($score, $prob, $rdiff1, $rdiff2) = split /,/, $_;
-	push @results, {
+	push @results10, {
 		score => $score,
 		prob => (sprintf "%.3f", $prob),
-		rdiff1 => (sprintf "%+d", int($rdiff1+0.5)),
-		rdiff2 => (sprintf "%+d", int($rdiff2+0.5)),
+		rdiff1 => (sprintf "%+d", foosball::round($rdiff1)),
+		rdiff2 => (sprintf "%+d", foosball::round($rdiff2)),
+	};
+}
+
+# 7-x table
+open ASSESS, "/srv/foosball.sesse.net/foosrank $rating1 $rd1 $rating2 $rd2 7 |"
+	or die "foosrank: $!";
+
+my @results7 = ();
+while (<ASSESS>) {
+	my ($score, $prob, $rdiff1, $rdiff2) = split /,/, $_;
+	push @results7, {
+		score => $score,
+		prob => (sprintf "%.3f", $prob),
+		rdiff1 => (sprintf "%+d", foosball::round($rdiff1)),
+		rdiff2 => (sprintf "%+d", foosball::round($rdiff2)),
 	};
 }
 
@@ -43,6 +59,9 @@ print CGI->header(-type=>'application/xhtml+xml');
 my $doc = XML::Template::process_file('assess.xml', {
 	'username1' => $username1,
 	'username2' => $username2,
-	'#results' => \@results,
+	'rating1' => foosball::round($rating1),
+	'rating2' => foosball::round($rating2),
+	'#results10' => XML::Template::alternate('tr/class', \@results10, 'odd', 'even'),
+	'#results7' => XML::Template::alternate('tr/class', \@results7, 'odd', 'even'),
 });
 print $doc->toString;