"Candy" now has a white star by it; updated parsers and all relevant SQL.

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 3539946c458e6e9b1c64825ed9cf850ba99b4ad6..0771cc8e36aa4411fb5cd4888f2f4b08bd45d0cb 100644 (file)
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -193,7 +193,7 @@ sub song_map {
        $song =~ s/Keep On Movin/Keep On Movin'/;
        $song =~ s/So Deep/So Deep (Perfect Sphere Mix)/;
        $song =~ s/Aarons Party/Aaron's Party (Come Get It)/;
-       $song =~ s/Candy \*/Candy/;
+       $song =~ s/Candy \*/Candy\xe2\x98\x86/;
        $song =~ s/www\.blondie girl/www.blonde girl (MOMO Mix)/;
        $song =~ s/DXY/DXY!/;
        $song =~ s/Burning the floor/Burnin' the Floor/;

diff --git a/parse/parse-ddrfreak-songlist.pl b/parse/parse-ddrfreak-songlist.pl
index d4f3e5c937d5e0f742de21a6df97efb6f46addc5..532c182cc86de7e1bc98e35e767f480ab67f72d5 100644 (file)
--- a/parse/parse-ddrfreak-songlist.pl
+++ b/parse/parse-ddrfreak-songlist.pl
@@ -88,6 +88,7 @@ while (<>) {
        # Some HTML -> UTF-8 stuff
        $songname =~ s/&hearts;/\xe2\x9d\xa4/g;
        $songname =~ s/&forall;/\xe2\x88\x80/g;
+       $songname =~ s/CANDY&#9733;/CANDY\xe2\x98\x86/g;  # white star, not black
        $songname =~ s/&#9733;/\xe2\x98\x85/g;
        $songname =~ s/&#233;/\xc3\xa9/g;
        $songname =~ s/<sup>2<\/sup>/\xc2\xb2/g;

diff --git a/sql/cc04/cc1-04.sql b/sql/cc04/cc1-04.sql
index ddb4b5fd85fc62159a099fda1d904cfc976e9dea..94b715e4b20bbe15ae01b89b84d5d83ca66c3456 100644 (file)
--- a/sql/cc04/cc1-04.sql
+++ b/sql/cc04/cc1-04.sql
@@ -229,7 +229,7 @@ INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
 INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (
    (SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004'),
    1, 1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy'))
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆'))
 );
 UPDATE rounds SET randomsongs=2 WHERE 
   tournament=(SELECT tournament FROM tournaments WHERE tournamentname='Challenge Cup 1 - 2004') AND 
@@ -256,7 +256,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    1, 1,
    (SELECT player FROM players WHERE nick='Haggar'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    'f',
    7204);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
@@ -286,7 +286,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    1, 1,
    (SELECT player FROM players WHERE nick='Ylini'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    'f',
    6302);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
@@ -316,7 +316,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    1, 1,
    (SELECT player FROM players WHERE nick='Mulefisk'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    'f',
    7205);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
@@ -346,7 +346,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    1, 1,
    (SELECT player FROM players WHERE nick='Slusk'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    'f',
    6465);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
@@ -376,7 +376,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    1, 1,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    'f',
    8480);
 INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (
@@ -2297,7 +2297,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4, 0,
    (SELECT player FROM players WHERE nick='Tom'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    't',
    8379);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (

diff --git a/sql/cc04/cc2-04.sql b/sql/cc04/cc2-04.sql
index 92668a232a4725bb89065816dd858765c182f31f..d1585b55138fd1e47995edb8566e41fd7cae7c0d 100644 (file)
--- a/sql/cc04/cc2-04.sql
+++ b/sql/cc04/cc2-04.sql
@@ -608,7 +608,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    1, 3,
    (SELECT player FROM players WHERE nick='OJK'),
    2,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    't',
    8625);
 INSERT INTO rounds (tournament, round, randomsongs, chosensongs) 

diff --git a/sql/cc04/cc3-04.sql b/sql/cc04/cc3-04.sql
index fab363454406127b54def673be9f474db37fdcd0..33a23c624cdbcf6c549f79c269b4f33c0267cdba 100644 (file)
--- a/sql/cc04/cc3-04.sql
+++ b/sql/cc04/cc3-04.sql
@@ -1978,7 +1978,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    3, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    't',
    8627);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (

diff --git a/sql/cc04/cc5-04.sql b/sql/cc04/cc5-04.sql
index a58225a69b837f6343424bf3e29071c94f6af461..0d29e4475cd36ff51e7519b5fe333e32768f953e 100644 (file)
--- a/sql/cc04/cc5-04.sql
+++ b/sql/cc04/cc5-04.sql
@@ -2463,7 +2463,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    4, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    't',
    8855);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (

diff --git a/sql/cc04/cc6-04.sql b/sql/cc04/cc6-04.sql
index 07f07c08391807cc87881a0c659b7fae3b9a347b..ded5b7c915b0520f5dae56e759054f4d95dda21d 100644 (file)
--- a/sql/cc04/cc6-04.sql
+++ b/sql/cc04/cc6-04.sql
@@ -2834,7 +2834,7 @@ INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chose
    7, 0,
    (SELECT player FROM players WHERE nick='OJK'),
    1,
-   (SELECT song FROM songs WHERE lower(title)=lower('Candy')),
+   (SELECT song FROM songs WHERE lower(title)=lower('Candy☆')),
    't',
    8841);
 INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (

diff --git a/sql/em2-songlist.sql b/sql/em2-songlist.sql
index a5bacd8b684e0d5af57b3e3e37be5d504c45ffa0..bda7fab78187d588b641a1987556fa1b4f50d5a6 100644 (file)
--- a/sql/em2-songlist.sql
+++ b/sql/em2-songlist.sql
@@ -319,14 +319,14 @@ INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((S
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Burnin\' the Floor'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','standard',4);
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Burnin\' the Floor'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','difficult',6);
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Burnin\' the Floor'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','expert',8);
-INSERT INTO songs (title,artist,minbpm,maxbpm) VALUES ('Candy','Luv UNLIMITED',192,192);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','beginner',2);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','standard',4);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','difficult',5);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','expert',8);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','standard',4);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','difficult',6);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','expert',9);
+INSERT INTO songs (title,artist,minbpm,maxbpm) VALUES ('Candy☆','Luv UNLIMITED',192,192);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','beginner',2);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','standard',4);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','difficult',5);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','expert',8);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','standard',4);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','difficult',6);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Candy☆'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'double','expert',9);
 INSERT INTO songs (title,artist,minbpm,maxbpm) VALUES ('Crash!','mr. Brian & The Final Band',200,200);
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Crash!'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','beginner',3);
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE title='Crash!'),(SELECT machine FROM machines WHERE machinename='Dancing Stage EuroMix 2'),'single','standard',4);

diff --git a/sql/ex-songlist.sql b/sql/ex-songlist.sql
index 040b7aa380094d60521f0f3258278ae689678b08..24dd1f5616d1a9a5bdd5c07403f0cad53b116d6f 100644 (file)
--- a/sql/ex-songlist.sql
+++ b/sql/ex-songlist.sql
@@ -447,14 +447,14 @@ INSERT INTO songs SELECT nextval('songs_song_seq') AS song, 'WILD RUSH (FROM NON
 INSERT INTO machinesongs SELECT ( SELECT song FROM songs WHERE LOWER(title)=LOWER('WILD RUSH (FROM NONSTOP MEGAMIX)') ), ( SELECT machine FROM machines WHERE machinename='DDR Extreme' );
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('WILD RUSH (FROM NONSTOP MEGAMIX)')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','challenge',7);
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('WILD RUSH (FROM NONSTOP MEGAMIX)')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','challenge',7);
-INSERT INTO songs SELECT nextval('songs_song_seq') AS song, 'CANDYâ\98\85' AS title, 'Luv unlimited' AS artist, 0 AS minbpm, 0 AS maxbpm WHERE LOWER('CANDYâ\98\85') NOT IN ( SELECT LOWER(title) FROM songs );
-INSERT INTO machinesongs SELECT ( SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85') ), ( SELECT machine FROM machines WHERE machinename='DDR Extreme' );
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','standard',4);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','difficult',5);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','expert',8);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','standard',4);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','difficult',6);
-INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\85')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','expert',9);
+INSERT INTO songs SELECT nextval('songs_song_seq') AS song, 'CANDYâ\98\86' AS title, 'Luv unlimited' AS artist, 0 AS minbpm, 0 AS maxbpm WHERE LOWER('CANDYâ\98\86') NOT IN ( SELECT LOWER(title) FROM songs );
+INSERT INTO machinesongs SELECT ( SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86') ), ( SELECT machine FROM machines WHERE machinename='DDR Extreme' );
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','standard',4);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','difficult',5);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','expert',8);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','standard',4);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','difficult',6);
+INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDYâ\98\86')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','expert',9);
 INSERT INTO songs SELECT nextval('songs_song_seq') AS song, 'COW GIRL' AS title, 'BAMBEE' AS artist, 0 AS minbpm, 0 AS maxbpm WHERE LOWER('COW GIRL') NOT IN ( SELECT LOWER(title) FROM songs );
 INSERT INTO machinesongs SELECT ( SELECT song FROM songs WHERE LOWER(title)=LOWER('COW GIRL') ), ( SELECT machine FROM machines WHERE machinename='DDR Extreme' );
 INSERT INTO songratings (song,machine,playmode,difficulty,feetrating) VALUES ((SELECT song FROM songs WHERE LOWER(title)=LOWER('COW GIRL')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'single','standard',3);