From 2eb7f1827771ea7267c94bfe0c83adc9767872b8 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 4 Apr 2005 16:04:06 +0000 Subject: [PATCH 1/1] Pull patch into the right branch. Patches applied: * sgunderson@bigfoot.com--2005-private/ccbs--pgweb--1.0--patch-22 More Norwegifying. --- html/players.pl | 2 +- html/songs.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html/players.pl b/html/players.pl index 8158d4d..dcce199 100755 --- a/html/players.pl +++ b/html/players.pl @@ -12,7 +12,7 @@ my $dbh = ccbs::db_connect(); my $players = ccbs::db_fetch_all($dbh, 'SELECT player,nick,countryname,clubname,count(*) AS num_songs,COUNT(DISTINCT song) AS num_unique_songs,COUNT(DISTINCT tournament) AS num_tournaments,AVG(score)::integer AS avg_score,MAX(score) AS high_score FROM scores NATURAL JOIN players NATURAL JOIN countries NATURAL LEFT JOIN clubs GROUP BY player,nick,countryname,clubname ORDER BY LOWER(nick)'); ccbs::print_header(); -ccbs::process_template('players.tmpl', 'Players', { +ccbs::process_template('players.tmpl', 'Spillere', { players => $players, }); $dbh->disconnect; diff --git a/html/songs.pl b/html/songs.pl index 6ae2469..b140873 100755 --- a/html/songs.pl +++ b/html/songs.pl @@ -12,7 +12,7 @@ my $dbh = ccbs::db_connect(); my $songs = ccbs::db_fetch_all($dbh, 'SELECT machinename,song,title,artist,avg_score,stddev_score,high_score,high_score_player,high_score_nick FROM machinesongs NATURAL JOIN songs NATURAL JOIN machines NATURAL LEFT JOIN ( SELECT song,AVG(score)::integer AS avg_score,STDDEV(score)::integer AS stddev_score,MAX(score) AS high_score FROM scores GROUP BY song ) t1 NATURAL LEFT JOIN ( SELECT DISTINCT ON (song) song,player AS high_score_player,nick AS high_score_nick,score AS high_score FROM scores NATURAL JOIN players ORDER BY song,score DESC ) t2 ORDER BY machine,LOWER(title)'); ccbs::print_header(); -ccbs::process_template('songs.tmpl', 'Songs', { +ccbs::process_template('songs.tmpl', 'Sanger', { songs => $songs, }); $dbh->disconnect; -- 2.39.2