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

[ccbs] / parse / parse-ddreurope-tournament.pl

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index b0da713c3ad7523610a6395807122a396867d928..0771cc8e36aa4411fb5cd4888f2f4b08bd45d0cb 100644 (file)
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -41,9 +41,6 @@ while (<>) {
        if (/^ <tr><td \s* class=dtd> .*? class="link"> (.*?) <\/a> $/x) {
                $player = $1;
 
-               # Woot, evil
-               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $player, $player;
-               
                printf "INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (\n";
                print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
                print "   $round, $group,\n";
@@ -148,9 +145,14 @@ while (<>) {
                # Whoa :-)
                $points = 'NULL' unless defined($points);
 
+               # Woot, evil
+               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $nick, $nick;
+               
                print "INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (\n";
                print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
-               print "   1, '$nick', $points);\n";
+               print "   1,\n";
+               print "   (SELECT player FROM players WHERE nick='$nick'),\n";
+               print "   $points);\n";
        }
 
        # All other places
@@ -162,9 +164,14 @@ while (<>) {
                # Whoa :-)
                $points = 'NULL' unless defined($points);
 
+               # Woot, evil
+               printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick WHERE '%s' NOT IN ( SELECT nick FROM players );\n", $nick, $nick;
+               
                print "INSERT INTO tournamentrankings (tournament, ranking, player, points) VALUES (\n";
                print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
-               print "   $ranking, '$nick', $points);\n";
+               print "   $ranking,\n";
+               print "   (SELECT player FROM players WHERE nick='$nick'),\n";
+               print "   $points);\n";
        }       
 }
 
@@ -186,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/;