]> git.sesse.net Git - wloh/blobdiff - www/index.pl
projects / wloh / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix a reference to the variable in wrong scope.
[wloh] / www / index.pl
diff --git a/www/index.pl b/www/index.pl
index fd3228b7a3894676b1247e19024c9fe2350af079..c26f12892168ef5702e47404d1e0dde34df32667 100755 (executable)
--- a/www/index.pl
+++ b/www/index.pl
@@ -39,12 +39,6 @@ sub color {
        return int(255.0 * ($x ** (1.80)));
 }
 
-sub get_max_season {
-       my $dbh = shift;
-       my $ref = $dbh->selectrow_hashref('SELECT MAX(sesong) AS max_sesong FROM fotballserier');
-       return $ref->{'max_sesong'};
-}
-
 sub get_divisions {
        my ($dbh, $season) = @_;
 
@@ -177,6 +171,10 @@ sub get_covariance_matrix {
 sub write_parms_to_file {
        my ($aux_parms, $match_stddev, $used_ratings, $used_cov) = @_;
 
+       POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
+
+       my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
+
        POSIX::setlocale(&POSIX::LC_ALL, 'C');
 
        my $tmpnam = POSIX::tmpnam();
@@ -186,7 +184,7 @@ sub write_parms_to_file {
        printf MCCALC "%f\n", $match_stddev;
        printf MCCALC "%d\n", scalar keys %players;
 
-       for my $id (keys %players) {
+       for my $id (@sorted_players) {
                my $rating = $used_ratings->{$id} // 500.0;
                printf MCCALC "%s %f\n", $id, $rating;
        }
@@ -220,7 +218,18 @@ sub make_table {
        ++$num_tables;
 
        print <<"EOF";
-
+    <script type="text/javascript">
+    <!--
+function showScenario(element_id, url) {
+    var obj = document.getElementById(element_id);
+    var parent = obj.parentElement;
+    parent.removeChild(obj);
+    obj = obj.cloneNode(false);
+    obj.data = url;
+    parent.appendChild(obj);
+}
+    //-->
+    </script>
     <table class="probmatrix">
       <tr>
         <th></th>
@@ -239,7 +248,7 @@ EOF
                $prob{$player} = [ @x[1..$#x] ];
        }
        close MCCALC;
-       #unlink $tmpnam;
+       unlink $tmpnam;
 
        my $num_games = scalar keys %prob;
        for my $i (1..$num_games) {
@@ -267,7 +276,12 @@ EOF
                                ($r, $b) = ($b, $r);
                        }
 
-                       printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\"><a class=\"unmarkedlink\" href=\"javascript:var obj=document.getElementById('scenario$num_tables');var parent=obj.parentElement;parent.removeChild(obj);obj=obj.cloneNode();obj.data = '/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i';parent.appendChild(obj);\">%.1f%%</a></td>\n", $pn * 100.0;
+                       my $num_total_games = ($num_games * ($num_games - 1)) / 2;
+                       if (scalar @matches == $num_total_games || $prob{$player}->[$i - 1] == $trials) {
+                               printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\">%.1f%%</td>\n", $pn * 100.0;
+                       } else {
+                               printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\"><a class=\"unmarkedlink\" href=\"javascript:showScenario('scenario$num_tables', '/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i');\">%.1f%%</a></td>\n", $pn * 100.0;
+                       }
                }
 
                unless ($lowest_division) {
@@ -293,9 +307,9 @@ sub find_avg_rating {
 
        my $sum_rating = 0.0;
        for my $r (values %$ratings) {
-               $sum_rating += $r;
+               $sum_rating += ($r // 500.0);
        }
-       return $sum_rating / scalar keys %ratings;
+       return $sum_rating / scalar keys %$ratings;
 }
 
 sub get_auxillary_parameters {
@@ -320,12 +334,19 @@ sub print_header {
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no">
   <head>
     <title>$title</title>
-    <link rel="stylesheet" href="/style" type="text/css" />
+    <link rel="stylesheet" href="style" type="text/css" />
   </head>
   <body>
 EOF
 }
 
+sub get_locale {
+       my $cgi = shift;
+       my $url = $cgi->url(-absolute => 1);
+       $url =~ m#^/([a-z][a-z]-[A-Z][A-Z])/# or die "Invalid locale!";
+       return $1;
+}
+
 sub print_footer {
        print <<"EOF";
   </body>
@@ -341,7 +362,7 @@ my $subdivision = $cgi->param('avdeling') // -1;
 my $match_player = $cgi->param('spiller');
 my $match_position = $cgi->param('posisjon');
 
-my $season = get_max_season($dbh);
+my $season = wloh_common::get_max_season($dbh);
 my @divisions = get_divisions($dbh, $season);
 $division = 1 if (!grep { $_ == $division } @divisions);
 my @subdivisions = get_subdivisions($dbh, $season, $division);
@@ -368,12 +389,17 @@ if (defined($match_player) && defined($match_position)) {
                push @scenario, [ $1, $2, $3 ];
        }
        close MCCALC;
-       #unlink $tmpnam;
+       unlink $tmpnam;
+
+       my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
+       my $player_name = $players{$sorted_players[$match_player]};
 
        if (scalar @scenario == 0) {
-               # FIXME: distinguish between "all played" and "none found"
-               print "    <p>Fant ingen m&aring;te dette kunne skje p&aring.</p>\n";
+               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);
        } 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];
@@ -405,7 +431,7 @@ EOF
 
        print <<"EOF";
     <p style="clear: both; padding-top: 1em;">Under er en variant som tar relativ spillestyrke med i beregningen;
-      se <a href="/rating">ratingsiden</a>.</p>
+      se <a href="rating">ratingsiden</a>.</p>
 EOF
 
        make_table($aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision);
My Wordfeud rating system (wloh.sesse.net).