From 29b7d13a713879f6a1db0d2040fc37a558d9a330 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Mon, 14 Feb 2005 01:42:16 +0000 Subject: [PATCH] Make DDR Europe parser script convert from ISO8859-1 to UTF-8. Update test SQL accordingly. --- sql/cc04/cc3-04.sql | 10 +++++----- sql/cc04/cc4-04.sql | 10 +++++----- sql/cc04/cc7-04.sql | 2 +- sql/cc04/update-cc04.sh | 1 + 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sql/cc04/cc3-04.sql b/sql/cc04/cc3-04.sql index 606bbdd..b235ff4 100644 --- a/sql/cc04/cc3-04.sql +++ b/sql/cc04/cc3-04.sql @@ -64,17 +64,17 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose (SELECT song FROM songs WHERE lower(title)=lower('Crash!')), 't', 7032); -INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players ); +INSERT INTO players SELECT nextval('players_player_seq') AS player, 'PÃ¥l Andre' AS nick WHERE 'PÃ¥l Andre' NOT IN ( SELECT nick FROM players ); INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 2 ); INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 0, (SELECT song FROM songs WHERE lower(title)=lower('B4U (B4 Za Beat Mix)')), 'f', @@ -82,7 +82,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 1, (SELECT song FROM songs WHERE lower(title)=lower('Can\'t Stop Fallin\' in Love')), 'f', @@ -90,7 +90,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 3'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 2, (SELECT song FROM songs WHERE lower(title)=lower('Dead End')), 't', diff --git a/sql/cc04/cc4-04.sql b/sql/cc04/cc4-04.sql index e3f9850..292a562 100644 --- a/sql/cc04/cc4-04.sql +++ b/sql/cc04/cc4-04.sql @@ -33,17 +33,17 @@ UPDATE rounds SET randomsongs=2 WHERE UPDATE rounds SET chosensongs=1 WHERE tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4') AND round=1; -INSERT INTO players SELECT nextval('players_player_seq') AS player, 'Pål Andre' AS nick WHERE 'Pål Andre' NOT IN ( SELECT nick FROM players ); +INSERT INTO players SELECT nextval('players_player_seq') AS player, 'PÃ¥l Andre' AS nick WHERE 'PÃ¥l Andre' NOT IN ( SELECT nick FROM players ); INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 1 ); INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 0, (SELECT song FROM songs WHERE lower(title)=lower('Nori Nori Nori')), 'f', @@ -51,7 +51,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 1, (SELECT song FROM songs WHERE lower(title)=lower('PARANOiA Rebirth')), 'f', @@ -59,7 +59,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES ( (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 4'), 1, 1, - (SELECT player FROM players WHERE nick='Pål Andre'), + (SELECT player FROM players WHERE nick='PÃ¥l Andre'), 2, (SELECT song FROM songs WHERE lower(title)=lower('Paranoia KCET (Clean Mix)')), 't', diff --git a/sql/cc04/cc7-04.sql b/sql/cc04/cc7-04.sql index 162467c..bf933a6 100644 --- a/sql/cc04/cc7-04.sql +++ b/sql/cc04/cc7-04.sql @@ -4,7 +4,7 @@ INSERT INTO tournaments (SELECT season FROM seasons WHERE seasonname='Challenge Cup 2004'), 'Challenge Cup 7', (SELECT country FROM countries WHERE countryname='Norway'), - 'Tønsberg - Sjøsenteret bowling', + 'Tønsberg - Sjøsenteret bowling', '2004-11-21', (SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'), (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='10K Machine score') diff --git a/sql/cc04/update-cc04.sh b/sql/cc04/update-cc04.sh index 69e83b4..d1902bb 100755 --- a/sql/cc04/update-cc04.sh +++ b/sql/cc04/update-cc04.sh @@ -5,6 +5,7 @@ SEASON="Challenge Cup 2004" ( while read ccno id; do wget -O- "http://www.ddreurope.com/results.php?since=0&act=2&t_id=$id" | + iconv -f latin1 -t utf8 | perl ../../parse/parse-ddreurope-tournament.pl "$SEASON" > cc$ccno-04.sql done ) <<"EOF" -- 2.39.2