X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=parse%2Fparse-ddreurope-tournament.pl;h=1a55afb42abbcd3bf53c7108de8bfd1729de5a23;hb=01dd94416d9c587dee1021e84fb3645a385ae825;hp=83b95f226f5fb0b2bd80f40c31860e8824868f41;hpb=2ca0daa6916f97279a48669592e198f0d124cc59;p=ccbs

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 83b95f2..1a55afb 100644
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -59,10 +59,11 @@ while (<>) {
 
 		# random songs
 		while (s/<td \s* class=dtdm> (\d+) <\/td>//x) {
-			printf "INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (\n";
+			printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, 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 "   $i,\n";
 			print "   (SELECT song FROM songs WHERE lower(title)=lower('$rsongs[$i]')),\n";
 			print "   'f',\n";
 			print "   $1);\n";
@@ -70,17 +71,20 @@ while (<>) {
 		}
 
 		# chosen songs
-		while (s/<td \s* class=dtdsong> .*? class="link"> (.*?) <\/a> .*? <td class=dtdscore> (\d+) <\/td>//x) {
+		while (s/<td \s* class=dtdsong> .*? class="link"> (.*?) <\/a> .*? <td \s* class=dtdscore> (\d+) <\/td>//x) {
 			my $song = song_map($1);
+			my $score = $2;
 			$song =~ s/'/\\'/g;
 		
-			printf "INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (\n";
+			printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, 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 "   $i,\n";
 			print "   (SELECT song FROM songs WHERE lower(title)=lower('$song')),\n";
 			print "   't',\n";
-			print "   $2);\n";
+			print "   $score);\n";
+			++$i;
 		}
 	}