From: Steinar H. Gunderson Date: Sat, 5 Mar 2005 02:50:40 +0000 (+0000) Subject: "Candy" now has a white star by it; updated parsers and all relevant SQL. X-Git-Url: https://git.sesse.net/?p=ccbs;a=commitdiff_plain;h=be47bb038c18770e13983773f441ee7dbf8d81b3;hp=9b92b979d4647472f0beefae30c08855a3284966 "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 3539946..0771cc8 100644 --- 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 d4f3e5c..532c182 100644 --- a/parse/parse-ddrfreak-songlist.pl +++ b/parse/parse-ddrfreak-songlist.pl @@ -88,6 +88,7 @@ while (<>) { # Some HTML -> UTF-8 stuff $songname =~ s/♥/\xe2\x9d\xa4/g; $songname =~ s/∀/\xe2\x88\x80/g; + $songname =~ s/CANDY★/CANDY\xe2\x98\x86/g; # white star, not black $songname =~ s/★/\xe2\x98\x85/g; $songname =~ s/é/\xc3\xa9/g; $songname =~ s/2<\/sup>/\xc2\xb2/g; diff --git a/sql/cc04/cc1-04.sql b/sql/cc04/cc1-04.sql index ddb4b5f..94b715e 100644 --- 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 92668a2..d1585b5 100644 --- 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 fab3634..33a23c6 100644 --- 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 a58225a..0d29e44 100644 --- 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 07f07c0..ded5b7c 100644 --- 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 a5bacd8..bda7fab 100644 --- 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 040b7aa..24dd1f5 100644 --- 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★' AS title, 'Luv unlimited' AS artist, 0 AS minbpm, 0 AS maxbpm WHERE LOWER('CANDY★') NOT IN ( SELECT LOWER(title) FROM songs ); -INSERT INTO machinesongs SELECT ( SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDY★') ), ( 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★')),(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★')),(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★')),(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★')),(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★')),(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★')),(SELECT machine FROM machines WHERE machinename='DDR Extreme'),'double','expert',9); +INSERT INTO songs SELECT nextval('songs_song_seq') AS song, 'CANDY☆' AS title, 'Luv unlimited' AS artist, 0 AS minbpm, 0 AS maxbpm WHERE LOWER('CANDY☆') NOT IN ( SELECT LOWER(title) FROM songs ); +INSERT INTO machinesongs SELECT ( SELECT song FROM songs WHERE LOWER(title)=LOWER('CANDY☆') ), ( 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☆')),(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☆')),(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☆')),(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☆')),(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☆')),(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☆')),(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);