X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=parse%2Fparse-ddreurope-tournament.pl;h=0771cc8e36aa4411fb5cd4888f2f4b08bd45d0cb;hb=be47bb038c18770e13983773f441ee7dbf8d81b3;hp=5773f13648428f863d5d2e7953573683cc873a78;hpb=aee1f77ca1957086ed876b49e1b5e4f744eef2f2;p=ccbs

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 5773f13..0771cc8 100644
--- 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";
@@ -140,6 +137,42 @@ while (<>) {
 		print "  round=$round;\n";
 	}
 
+	# First place
+	if (/A \s* well-earned \s* victory \s* for .*? class="link"> (.*?) <\/a> (?: , \s* who \s* got \s* (\d+) \s* point )?/x) {
+		my $nick = $1;
+		my $points = $2;
+
+		# 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,\n";
+		print "   (SELECT player FROM players WHERE nick='$nick'),\n";
+		print "   $points);\n";
+	}
+
+	# All other places
+	while (s/(\d+) (?: st | nd | rd | th ) \s* place: .*? class="link"> (.*?) <\/a> \s* (?: got \s* (\d+) \s* point )?//x) {
+		my $ranking = $1;	
+		my $nick = $2;
+		my $points = $3;
+
+		# 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,\n";
+		print "   (SELECT player FROM players WHERE nick='$nick'),\n";
+		print "   $points);\n";
+	}	
 }
 
 printf "commit;\n";
@@ -160,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/;