Factor player and rating fetching into its own function.

diff --git a/www/index.pl b/www/index.pl
index 0ce8cc6d444d844338f03d51b0304e21b3545b4f..34cc7077471389d7ca4bde8343ae0ee40b773eb9 100755 (executable)
--- a/www/index.pl
+++ b/www/index.pl
@@ -121,6 +121,46 @@ EOF
 EOF
 }
 
+sub get_players_and_ratings {
+       my ($dbh, $season, $division, $subdivision) = @_;
+
+       my $q = $dbh->prepare('SELECT fotballdeltagere.id,fotballdeltagere.navn,rating,rating_stddev FROM fotballdeltagere JOIN fotballserier ON fotballdeltagere.serie=fotballserier.nr LEFT JOIN ratings ON fotballdeltagere.id=ratings.id WHERE sesong=? AND divisjon=? AND avdeling=?');
+       $q->execute($season, $division, $subdivision);
+
+       while (my $ref = $q->fetchrow_hashref) {
+               my $id = $ref->{'id'};
+               $players{$id} = sanitize(Encode::decode_utf8($ref->{'navn'}));
+               $ratings{$id} = $ref->{'rating'};
+               $ratings_stddev{$id} = $ref->{'rating_stddev'};
+       }
+       $q->finish;
+}
+
+sub get_matches {
+       my ($dbh, $season, $division, $subdivision) = @_;
+
+       my @matches = ();
+       my $q = $dbh->prepare('
+       SELECT
+         d1.id AS p1, d2.id AS p2, maalfor AS score1, maalmot AS score2
+       FROM fotballresultater r
+         JOIN fotballserier s ON r.serie=s.nr
+         JOIN fotballdeltagere d1 ON r.lagrecno=d1.nr AND r.serie=d1.serie
+         JOIN fotballdeltagere d2 ON r.motstander=d2.nr AND r.serie=d2.serie
+       WHERE
+         sesong=? AND divisjon=? AND avdeling=?
+         AND lagrecno > motstander
+       ');
+       $q->execute($season, $division, $subdivision);
+
+       while (my $ref = $q->fetchrow_hashref) {
+               push @matches, [ $ref->{'p1'}, $ref->{'p2'}, $ref->{'score1'}, $ref->{'score2'} ];
+       }
+       $q->finish;
+
+       return @matches;
+}
+
 sub get_covariance_matrix {
        my ($dbh, @players) = @_;
 
@@ -243,6 +283,16 @@ EOF
 EOF
 }
 
+sub find_avg_rating {
+       my ($ratings) = shift;
+
+       my $sum_rating = 0.0;
+       for my $r (values %$ratings) {
+               $sum_rating += $r;
+       }
+       return $sum_rating / scalar keys %ratings;
+}
+
 # Get auxillary parameters
 my $q = $dbh->prepare('SELECT * FROM ratings WHERE id < 0');
 $q->execute;
@@ -292,38 +342,9 @@ $subdivision = 1 if (!grep { $_ == $subdivision } @subdivisions);
 
 print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision);
 
-# Get players and ratings
-my $sum_rating = 0.0;
-
-$q = $dbh->prepare('SELECT fotballdeltagere.id,fotballdeltagere.navn,rating,rating_stddev FROM fotballdeltagere JOIN fotballserier ON fotballdeltagere.serie=fotballserier.nr LEFT JOIN ratings ON fotballdeltagere.id=ratings.id WHERE sesong=? AND divisjon=? AND avdeling=?');
-$q->execute($season, $division, $subdivision);
+get_players_and_ratings($dbh, $season, $division, $subdivision);
 
-while (my $ref = $q->fetchrow_hashref) {
-       my $id = $ref->{'id'};
-       $players{$id} = sanitize(Encode::decode_utf8($ref->{'navn'}));
-       $ratings{$id} = $ref->{'rating'};
-       $ratings_stddev{$id} = $ref->{'rating_stddev'};
-       $sum_rating += $ref->{'rating'};
-}
-$q->finish;
-
-$q = $dbh->prepare('
-SELECT
-  d1.id AS p1, d2.id AS p2, maalfor AS score1, maalmot AS score2
-FROM fotballresultater r
-  JOIN fotballserier s ON r.serie=s.nr
-  JOIN fotballdeltagere d1 ON r.lagrecno=d1.nr AND r.serie=d1.serie
-  JOIN fotballdeltagere d2 ON r.motstander=d2.nr AND r.serie=d2.serie
-WHERE
-  sesong=? AND divisjon=? AND avdeling=?
-  AND lagrecno > motstander
-');
-$q->execute($season, $division, $subdivision);
-
-while (my $ref = $q->fetchrow_hashref) {
-       push @matches, [ $ref->{'p1'}, $ref->{'p2'}, $ref->{'score1'}, $ref->{'score2'} ];
-}
-$q->finish;
+my @matches = get_matches($dbh, $season, $division, $subdivision);
 
 my $cov = get_covariance_matrix($dbh, keys %players);
 
@@ -338,7 +359,7 @@ EOF
 
 make_table($lowest_division, \%ratings, $cov);
 
-my $avg_rating = $sum_rating / scalar keys %players;
+my $avg_rating = find_avg_rating(\%ratings);
 printf "    <p>Gjennomsnittlig rating i denne avdelingen er <strong>%.1f</strong>.</p>\n", $avg_rating;
 
 wloh_common::output_last_sync($dbh);