X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=parse%2Fparse-ddreurope-tournament.pl;h=e838dd61fa33c834be20f9e84262113a424693ed;hp=ad3fe0776b20f38275146f99b547cbbc90f2718b;hb=fb3154af3cf6f2e25561a630518f67c5e65d1b31;hpb=62731f1052d2a3f21c2aac3511a0114bf6973c74

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index ad3fe07..e838dd6 100644
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -6,11 +6,10 @@ use Date::Manip;
 # Parses tournament results from the DDR Europe result list
 
 my $season = shift;
-my ($name, $round, $group, $player, @rsongs);
+my ($name, $round, $group, $player, $position, @rsongs);
 die "Missing season (give on command line)." if (!defined($season));
 
-# commented out -- see player below
-# print "begin;\n";
+print "begin;\n";
 
 while (<>) {
 	if (/<h2> \s* (.*?) \s* <\/h2>/x) {
@@ -37,6 +36,53 @@ while (<>) {
 		print "    (SELECT scoringsystem FROM scoringsystems WHERE name='$system')\n";
 		print ");\n";
 	}
+	
+	# Player's results (header)
+	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 name='$name'),\n";
+		print "   $round, $group,\n";
+		print "   (SELECT player FROM players WHERE nick='$player'),\n";
+		print "   $position\n";
+		print ");\n";
+		++$position;
+	}
+
+	# 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";
+		}
+	}
 
 	# New round
 	if (/<h3 \s* class=dthr> Round \s* (\d+) \s* <\/h3>/x) {
@@ -55,6 +101,8 @@ while (<>) {
 		$group = $2;
 		$group = 0 if ($1 eq 'Players');
 
+		$position = 1;
+
 		print "INSERT INTO groups (tournament, round, parallel) VALUES (\n";
 		print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
 		print "   $round, $group);\n";
@@ -88,47 +136,6 @@ while (<>) {
 		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;
-		printf "INSERT INTO roundparticipation (tournament, round, parallel, player) 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 ");\n";
-	}
-
-	# 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";