Attempt parsing scores.

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index d5ec424b3794610b7831bff6c61e352b883e3970..d2d06ee0becf41f93779b00f899b34d2f6afd246 100644 (file)
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -6,10 +6,11 @@ use Date::Manip;
 # Parses tournament results from the DDR Europe result list
 
 my $season = shift;
-my ($name, $round, @rsongs);
+my ($name, $round, $group, $player, @rsongs);
 die "Missing season (give on command line)." if (!defined($season));
 
-print "begin;\n";
+# commented out -- see player below
+# print "begin;\n";
 
 while (<>) {
        if (/<h2> \s* (.*?) \s* <\/h2>/x) {
@@ -51,7 +52,7 @@ while (<>) {
        # New group, and the random songs for it
        if (/<th \s* class=dthp> ( Players | Group \s* (\d+) )<\/th>/x) {
                # bit of an evil hack here
-               my $group = $2;
+               $group = $2;
                $group = 0 if ($1 eq 'Players');
 
                print "INSERT INTO groups (tournament, round, parallel) VALUES (\n";
@@ -62,22 +63,7 @@ while (<>) {
                @rsongs = ();
 
                while (s/<th \s* class=dthpsong> .*? "color:white"> (.*?) <\/a><\/th>//x) {
-                       my $song = $1;
-                       
-                       # different names for songs
-                       $song =~ s/Paranoia -Rebirth-/PARANOiA Rebirth/;
-                       $song =~ s/The Center of the heart/The Centre of the Heart (Stonebridge Club Mix)/;
-                       $song =~ s/Can't stop falling in love/Can't Stop Fallin' in Love/;
-                       $song =~ s/B4U -B4 ZA Beat Mix-/B4U (B4 Za Beat Mix)/;
-                       $song =~ s/Jam Jam Reggae/Jam Jam Reggae (AM Swing Mix)/;
-                       $song =~ s/Trip Machine -Climax-/Trip Machine Climax/;
-                       $song =~ s/Dont try to stop it/Don't Try to Stop It/;
-                       $song =~ s/Healing Vision -AM-/Healing Vision (Angelic Mix)/;
-                       $song =~ s/5,6,7,8/5, 6, 7, 8/;
-                       $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)/;
-
+                       my $song = song_map($1);
                        $song =~ s/'/\\'/g;
                
                        push @rsongs, $song;
@@ -101,6 +87,63 @@ while (<>) {
                print "  tournament=(SELECT tournament FROM tournaments WHERE name='$name') AND \n";
                print "  round=$round;\n";
        }
+
+       # Player's results (header)
+       if (/^ <tr><td \s* class=dtd> .*? class="link"> (.*?) <\/a> $/x) {
+               $player = $1;
+               printf "INSERT INTO players (nick) VALUES ('%s');\n", $player;
+       }
+
+       # Player's results (score)
+       if (/<td \s* class=dtdm>/x) {
+               my $i = 0;
+
+               # random songs
+               while (s/<td \s* class=dtdm> (\d+) <\/td>//x) {
+                       printf "INSERT INTO scores (tournament, round, parallel, player, 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 "   (SELECT song FROM songs WHERE lower(title)=lower('$rsongs[$i]')),\n";
+                       print "   'f',\n";
+                       print "   $1);\n";
+                       ++$i;
+               }
+
+               # chosen songs
+               while (s/<td \s* class=dtdsong> .*? class="link"> (.*?) <\/a> .*? <td class=dtdscore> (\d+) <\/td>//x) {
+                       my $song = song_map($1);
+                       $song =~ s/'/\\'/g;
+               
+                       printf "INSERT INTO scores (tournament, round, parallel, player, 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 "   (SELECT song FROM songs WHERE lower(title)=lower('$song')),\n";
+                       print "   't',\n";
+                       print "   $2);\n";
+               }
+       }
 }
 
 printf "commit;\n";
+
+# different names for songs
+sub song_map {
+       my $song = shift;
+
+       $song =~ s/Paranoia -Rebirth-/PARANOiA Rebirth/;
+       $song =~ s/The Center of the heart/The Centre of the Heart (Stonebridge Club Mix)/;
+       $song =~ s/Can't stop falling in love/Can't Stop Fallin' in Love/;
+       $song =~ s/B4U -B4 ZA Beat Mix-/B4U (B4 Za Beat Mix)/;
+       $song =~ s/Jam Jam Reggae/Jam Jam Reggae (AM Swing Mix)/;
+       $song =~ s/Trip Machine -Climax-/Trip Machine Climax/;
+       $song =~ s/Dont try to stop it/Don't Try to Stop It/;
+       $song =~ s/Healing Vision -AM-/Healing Vision (Angelic Mix)/;
+       $song =~ s/5,6,7,8/5, 6, 7, 8/;
+       $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)/;
+
+       return $song;
+}