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

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 1a55afb..5773f13 100644
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -26,14 +26,14 @@ while (<>) {
 		$mix =~ s/Euromix/EuroMix/;
 
 		print "INSERT INTO tournaments \n";
-		print "  (season, name, country, location, \"date\", machine, scoringsystem) VALUES (\n";
-		print "    (SELECT season FROM seasons WHERE name='$season'),\n";
+		print "  (season, tournamentname, country, location, \"date\", machine, scoringsystem) VALUES (\n";
+		print "    (SELECT season FROM seasons WHERE seasonname='$season'),\n";
 		print "    '$name',\n";
-		print "    (SELECT country FROM countries WHERE name='$country'),\n";
+		print "    (SELECT country FROM countries WHERE countryname='$country'),\n";
 		print "    '$location',\n";
 		printf "    '%s',\n", Date::Manip::UnixDate($date, '%Y-%m-%d');
-		print "    (SELECT machine FROM machines WHERE name='$mix'),\n";
-		print "    (SELECT scoringsystem FROM scoringsystems WHERE name='$system')\n";
+		print "    (SELECT machine FROM machines WHERE machinename='$mix'),\n";
+		print "    (SELECT scoringsystem FROM scoringsystems WHERE scoringsystemname='$system')\n";
 		print ");\n";
 	}
 	
@@ -45,7 +45,7 @@ while (<>) {
 		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 "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
 		print "   $round, $group,\n";
 		print "   (SELECT player FROM players WHERE nick='$player'),\n";
 		print "   $position\n";
@@ -60,7 +60,7 @@ while (<>) {
 		# 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 name='$name'),\n";
+			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
 			print "   $round, $group,\n";
 			print "   (SELECT player FROM players WHERE nick='$player'),\n";
 			print "   $i,\n";
@@ -77,7 +77,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 name='$name'),\n";
+			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
 			print "   $round, $group,\n";
 			print "   (SELECT player FROM players WHERE nick='$player'),\n";
 			print "   $i,\n";
@@ -94,7 +94,7 @@ while (<>) {
 
 		print "INSERT INTO rounds (tournament, round, randomsongs, chosensongs) \n";
 		print "  VALUES (\n";
-		print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
 		print "   $round,\n";
 		print "   0, 0);\n";  # Don't worry, we'll fix it later :-P
 	}
@@ -108,7 +108,7 @@ while (<>) {
 		$position = 1;
 
 		print "INSERT INTO groups (tournament, round, parallel) VALUES (\n";
-		print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+		print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
 		print "   $round, $group);\n";
 
 		# Find the random songs, if any
@@ -121,7 +121,7 @@ while (<>) {
 			push @rsongs, $song;
 
 			print "INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (\n";
-			print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+			print "   (SELECT tournament FROM tournaments WHERE tournamentname='$name'),\n";
 			print "   $round, $group,\n";
 			print "   (SELECT song FROM songs WHERE lower(title)=lower('$song'))\n";
 			print ");\n";
@@ -129,14 +129,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 name='$name') AND \n";
+		print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name') 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 name='$name') AND \n";
+		print "  tournament=(SELECT tournament FROM tournaments WHERE tournamentname='$name') AND \n";
 		print "  round=$round;\n";
 	}