Make DDR Europe parser script convert from ISO8859-1 to UTF-8. Update test SQL accord...

diff --git a/sql/cc04/cc3-04.sql b/sql/cc04/cc3-04.sql
index 606bbdd6ed393e7bc76a3e9e5ffe80878fd19772..b235ff4bfd24fe1546d53bfa3356ff4df595ace0 100644 (file)
--- 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 e3f985037f1762cb0a13dfceaf98856fc7b68ecd..292a5620302a54a32d5e35d9154fe29e2a80fb05 100644 (file)
--- 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 162467c65c298533ad2e7735ec57bfda5656dbc2..bf933a6cf943affa3e0bdf991cb013d44b9b1b83 100644 (file)
--- 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 69e83b49e0282401a39c9af6098747db4a929a7c..d1902bbc3b5d3b5d5b35dec6b5d82cb249eec7b2 100755 (executable)
--- 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"