Add error template.

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

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index e838dd61fa33c834be20f9e84262113a424693ed..1a55afb42abbcd3bf53c7108de8bfd1729de5a23 100644 (file)
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -59,10 +59,11 @@ while (<>) {
 
                # random songs
                while (s/<td \s* class=dtdm> (\d+) <\/td>//x) {
-                       printf "INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (\n";
+                       printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
                        print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
                        print "   $round, $group,\n";
                        print "   (SELECT player FROM players WHERE nick='$player'),\n";
+                       print "   $i,\n";
                        print "   (SELECT song FROM songs WHERE lower(title)=lower('$rsongs[$i]')),\n";
                        print "   'f',\n";
                        print "   $1);\n";
@@ -70,17 +71,20 @@ while (<>) {
                }
 
                # chosen songs
-               while (s/<td \s* class=dtdsong> .*? class="link"> (.*?) <\/a> .*? <td class=dtdscore> (\d+) <\/td>//x) {
+               while (s/<td \s* class=dtdsong> .*? class="link"> (.*?) <\/a> .*? <td \s* class=dtdscore> (\d+) <\/td>//x) {
                        my $song = song_map($1);
+                       my $score = $2;
                        $song =~ s/'/\\'/g;
                
-                       printf "INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (\n";
+                       printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
                        print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
                        print "   $round, $group,\n";
                        print "   (SELECT player FROM players WHERE nick='$player'),\n";
+                       print "   $i,\n";
                        print "   (SELECT song FROM songs WHERE lower(title)=lower('$song')),\n";
                        print "   't',\n";
-                       print "   $2);\n";
+                       print "   $score);\n";
+                       ++$i;
                }
        }
 
@@ -156,6 +160,22 @@ 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/www\.blondie girl/www.blonde girl (MOMO Mix)/;
+       $song =~ s/DXY/DXY!/;
+       $song =~ s/Burning the floor/Burnin' the Floor/;
+       $song =~ s/Never Gonna Make/Never Gonna Make (Factory Team Mix)/;
+       $song =~ s/Max300/Max 300/;
+       $song =~ s/Era/era (nostalmix)/;
+       $song =~ s/Electro Tuned/Electro Tuned (the SubS Mix)/;
+       $song =~ s/Make a Jam/Make A Jam!/;
+       $song =~ s/Paranoia KCET -clean mix-/Paranoia KCET (Clean Mix)/;
+       $song =~ s/Cant Stop -Speed Mix-/Can't Stop Fallin' in Love (SPEED MIX)/;
+       $song =~ s/Love This Feelin/Love This Feelin'/;
+       $song =~ s/Trip Machine -Luv mix-/Trip Machine (Luv Mix)/;
+       $song =~ s/Let The Beat Hit Them/Let the Beat Hit 'em!/;
+       $song =~ s/Luv To Me/Luv to Me (AMD Mix)/;
+       $song =~ s/20 November/20th November/;
 
        return $song;
 }