From dec0ff92103e212921be03744323ed3a3074e996 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 25 Mar 2012 17:41:58 +0200 Subject: [PATCH] Factor out some HTML headers and footers. --- www/index.pl | 71 +++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/www/index.pl b/www/index.pl index 34ae134..2cecec4 100755 --- a/www/index.pl +++ b/www/index.pl @@ -302,28 +302,54 @@ sub get_auxillary_parameters { return $aux_parms; } -my $aux_parms = get_auxillary_parameters($dbh); -my $match_stddev = $aux_parms->{-2} * sqrt(2.0); - -my $season; -my $division = $cgi->param('divisjon') // -1; -my $subdivision = $cgi->param('avdeling') // -1; -my $last_division = 0; - -POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8'); - -print $cgi->header(-type=>'text/html; charset=utf-8', -expires=>'now'); -printf <<"EOF", $match_stddev; +sub print_header { + my ($cgi, $title) = @_; + print $cgi->header(-type=>'text/html; charset=utf-8', -expires=>'now'); + print <<"EOF"; - WLoH-plasseringsannsynlighetsberegning + $title +EOF +} + +sub print_footer { + my $dbh = shift; + wloh_common::output_last_sync($dbh); + + print <<"EOF"; + + +EOF +} + +my $aux_parms = get_auxillary_parameters($dbh); +my $match_stddev = $aux_parms->{-2} * sqrt(2.0); + +my $season; +my $division = $cgi->param('divisjon') // -1; +my $subdivision = $cgi->param('avdeling') // -1; + +my $season = get_max_season($dbh); +my @divisions = get_divisions($dbh, $season); +$division = 1 if (!grep { $_ == $division } @divisions); +my @subdivisions = get_subdivisions($dbh, $season, $division); +$subdivision = 1 if (!grep { $_ == $subdivision } @subdivisions); + +get_players_and_ratings($dbh, $season, $division, $subdivision); +my @matches = get_matches($dbh, $season, $division, $subdivision); +my $cov = get_covariance_matrix($dbh, keys %players); + +print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning'); + +POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8'); +printf <<"EOF", $match_stddev;

WLoH-plasseringsannsynlighetsberegning

Dette er et hobbyprosjekt fra tredjepart, og ikke en offisiell del av @@ -337,20 +363,8 @@ printf <<"EOF", $match_stddev;

Spillerne er sortert etter nick.

EOF -my $season = get_max_season($dbh); -my @divisions = get_divisions($dbh, $season); -$division = 1 if (!grep { $_ == $division } @divisions); -my @subdivisions = get_subdivisions($dbh, $season, $division); -$subdivision = 1 if (!grep { $_ == $subdivision } @subdivisions); - print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision); -get_players_and_ratings($dbh, $season, $division, $subdivision); - -my @matches = get_matches($dbh, $season, $division, $subdivision); - -my $cov = get_covariance_matrix($dbh, keys %players); - my $max_division = $divisions[$#divisions]; my $lowest_division = ($division == $max_division); make_table($aux_parms, $match_stddev, $lowest_division, {}, {}); @@ -365,9 +379,4 @@ make_table($aux_parms, $match_stddev, $lowest_division, \%ratings, $cov); my $avg_rating = find_avg_rating(\%ratings); printf "
Gjennomsnittlig rating i denne avdelingen er %.1f.
\n", $avg_rating; -wloh_common::output_last_sync($dbh); - -print <<"EOF"; - - -EOF +print_footer($dbh); -- 2.39.2