X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Frating.pl;h=30951c4735c6848fe2b3b88df5b267da62cbb1c4;hb=51ea31c1dc6c87693c20bcdd2b1147359de926e4;hp=fa1eb9d9fda943eacaa1f91521fa7f5908b2bca8;hpb=da7fdbfd2feb8c602855322027d1312e446232e3;p=wloh

diff --git a/www/rating.pl b/www/rating.pl
index fa1eb9d..30951c4 100755
--- a/www/rating.pl
+++ b/www/rating.pl
@@ -32,7 +32,7 @@ my $season = wloh_common::get_max_season($dbh, $locale);
 
 # Pick up all the subdivisions' ratings.
 my %subdivision_ratings = ();
-my $q = $dbh->prepare('SELECT divisjon, avdeling, serie_id, AVG(rating) AS avg_rating FROM ratings NATURAL JOIN siste_divisjon NATURAL JOIN spiller_kultur WHERE kultur=? AND sesong=? GROUP BY divisjon, avdeling, serie_id ORDER BY divisjon, avdeling');
+my $q = $dbh->prepare('SELECT divisjon, avdeling, serie_id, AVG(rating) AS avg_rating FROM ratings NATURAL JOIN siste_divisjon NATURAL JOIN spiller_kultur WHERE kultur=? AND sesong=? AND NOT jukser GROUP BY divisjon, avdeling, serie_id ORDER BY divisjon, avdeling');
 $q->execute($locale, $season);
 
 while (my $ref = $q->fetchrow_hashref) {
@@ -43,7 +43,7 @@ while (my $ref = $q->fetchrow_hashref) {
 	push @{$subdivision_ratings{$division}}, [ $id, $rating ];
 }
 
-$q = $dbh->prepare('SELECT divisjon,AVG(rating) AS avg_rating,STDDEV(rating) AS stddev_rating FROM ratings NATURAL JOIN siste_divisjon NATURAL JOIN spiller_kultur WHERE kultur=? AND sesong=? GROUP BY divisjon ORDER BY divisjon');
+$q = $dbh->prepare('SELECT divisjon,AVG(rating) AS avg_rating,STDDEV(rating) AS stddev_rating FROM ratings NATURAL JOIN siste_divisjon NATURAL JOIN spiller_kultur WHERE kultur=? AND sesong=? AND NOT jukser GROUP BY divisjon ORDER BY divisjon');
 $q->execute($locale, $season);
 
 my @divisions = ();
@@ -77,6 +77,7 @@ FROM ratings
   NATURAL JOIN siste_divisjon
   NATURAL JOIN spiller_kultur
 WHERE kultur=?
+AND NOT jukser
 ORDER BY rating DESC');
 $q->execute($locale);
 
@@ -97,7 +98,7 @@ while (my $ref = $q->fetchrow_hashref) {
 	push @players, \%player;
 }
 
-print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m');
+print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+75m');
 wloh_common::process_template('rating', $locale, {
 	'#navbar' => wloh_common::get_navbar($cgi, $dbh, $locale),
 	'iterations' => $aux_parms->{'num_iterations'},