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

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 0771cc8..e3d6ba5 100644
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -24,10 +24,11 @@ while (<>) {
             /x) {
 		my ($country, $location, $date, $mix, $system) = ($1, $2, $3, $4, $5);
 		$mix =~ s/Euromix/EuroMix/;
+		$system = '10K Machine score' if ($system =~ /^\s*$/);
 
 		print "INSERT INTO tournaments \n";
 		print "  (season, tournamentname, country, location, \"date\", machine, scoringsystem) VALUES (\n";
-		print "    (SELECT season FROM seasons WHERE seasonname='$season'),\n";
+		print "    (SELECT season FROM seasons WHERE seasonname='$season' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 		print "    '$name',\n";
 		print "    (SELECT country FROM countries WHERE countryname='$country'),\n";
 		print "    '$location',\n";
@@ -42,7 +43,7 @@ while (<>) {
 		$player = $1;
 
 		printf "INSERT INTO roundparticipation (tournament, round, parallel, player, position) VALUES (\n";
-		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
+		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 		print "   $round, $group,\n";
 		print "   (SELECT player FROM players WHERE nick='$player'),\n";
 		print "   $position\n";
@@ -51,13 +52,13 @@ while (<>) {
 	}
 
 	# Player's results (score)
-	if (/<td \s* class=dtdm>/x) {
+	if (/<td \s* class=dtd (?: m | song ) >/x) {
 		my $i = 0;
 
 		# random songs
 		while (s/<td \s* class=dtdm> (\d+) <\/td>//x) {
 			printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
-			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
+			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 			print "   $round, $group,\n";
 			print "   (SELECT player FROM players WHERE nick='$player'),\n";
 			print "   $i,\n";
@@ -74,7 +75,7 @@ while (<>) {
 			$song =~ s/'/\\'/g;
 		
 			printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\n";
-			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
+			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 			print "   $round, $group,\n";
 			print "   (SELECT player FROM players WHERE nick='$player'),\n";
 			print "   $i,\n";
@@ -91,7 +92,7 @@ while (<>) {
 
 		print "INSERT INTO rounds (tournament, round, randomsongs, chosensongs) \n";
 		print "  VALUES (\n";
-		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
+		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 		print "   $round,\n";
 		print "   0, 0);\n";  # Don't worry, we'll fix it later :-P
 	}
@@ -105,7 +106,7 @@ while (<>) {
 		$position = 1;
 
 		print "INSERT INTO groups (tournament, round, parallel) VALUES (\n";
-		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
+		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 		print "   $round, $group);\n";
 
 		# Find the random songs, if any
@@ -118,7 +119,7 @@ while (<>) {
 			push @rsongs, $song;
 
 			print "INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (\n";
-			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
+			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 			print "   $round, $group,\n";
 			print "   (SELECT song FROM songs WHERE lower(title)=lower('$song'))\n";
 			print ");\n";
@@ -126,14 +127,14 @@ while (<>) {
 
 		# Correct the random songs in the table
 		printf "UPDATE rounds SET randomsongs=%u WHERE \n", scalar @rsongs;
-		print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name') AND \n";
+		print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )) AND \n";
 		print "  round=$round;\n";
 	}
 
 	# Header for chosen song (evil)
 	if (/<th \s* class=dthp \s* colspan=2>&nbsp<\/th>/x) {
 		printf "UPDATE rounds SET chosensongs=1 WHERE \n";
-		print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name') AND \n";
+		print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )) AND \n";
 		print "  round=$round;\n";
 	}
 
@@ -146,10 +147,10 @@ while (<>) {
 		$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;
+		printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country 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 "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 		print "   1,\n";
 		print "   (SELECT player FROM players WHERE nick='$nick'),\n";
 		print "   $points);\n";
@@ -165,10 +166,10 @@ while (<>) {
 		$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;
+		printf "INSERT INTO players SELECT nextval('players_player_seq') AS player, '%s' AS nick, ( SELECT country FROM countries WHERE countryname='Norway' ) AS country 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 "   (SELECT tournament FROM tournaments WHERE tournamentname='$name' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
 		print "   $ranking,\n";
 		print "   (SELECT player FROM players WHERE nick='$nick'),\n";
 		print "   $points);\n";