X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=parse%2Fparse-ddreurope-tournament.pl;h=d5ec424b3794610b7831bff6c61e352b883e3970;hp=0aea46768744ca07dd9cf65c7449ccf545069cc8;hb=da2ada5227ee7dd92b5d117a1decc0a95379aa6b;hpb=d06b81c2a6cd1abb6e0d2b38a148f4daeb0931d2

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 0aea467..d5ec424 100644
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -49,7 +49,7 @@ while (<>) {
 	}
 	
 	# New group, and the random songs for it
-	if (/<th \s* class=dthp> ( Players | Group (\d+) )<\/th>/x) {
+	if (/<th \s* class=dthp> ( Players | Group \s* (\d+) )<\/th>/x) {
 		# bit of an evil hack here
 		my $group = $2;
 		$group = 0 if ($1 eq 'Players');
@@ -62,12 +62,30 @@ while (<>) {
 		@rsongs = ();
 
 		while (s/<th \s* class=dthpsong> .*? "color:white"> (.*?) <\/a><\/th>//x) {
-			push @rsongs, $1;
+			my $song = $1;
+			
+			# different names for songs
+			$song =~ s/Paranoia -Rebirth-/PARANOiA Rebirth/;
+			$song =~ s/The Center of the heart/The Centre of the Heart (Stonebridge Club Mix)/;
+			$song =~ s/Can't stop falling in love/Can't Stop Fallin' in Love/;
+			$song =~ s/B4U -B4 ZA Beat Mix-/B4U (B4 Za Beat Mix)/;
+			$song =~ s/Jam Jam Reggae/Jam Jam Reggae (AM Swing Mix)/;
+			$song =~ s/Trip Machine -Climax-/Trip Machine Climax/;
+			$song =~ s/Dont try to stop it/Don't Try to Stop It/;
+			$song =~ s/Healing Vision -AM-/Healing Vision (Angelic Mix)/;
+			$song =~ s/5,6,7,8/5, 6, 7, 8/;
+			$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/'/\\'/g;
+		
+			push @rsongs, $song;
 
 			print "INSERT INTO roundrandomsongs (tournament, round, parallel, song) VALUES (\n";
 			print "   (SELECT tournament FROM tournaments WHERE name='$name'),\n";
 			print "   $round, $group,\n";
-			print "   (SELECT song FROM songs WHERE title='$1')\n";
+			print "   (SELECT song FROM songs WHERE lower(title)=lower('$song'))\n";
 			print ");\n";
 		}
 
@@ -77,9 +95,9 @@ while (<>) {
 		print "  round=$round;\n";
 	}
 
-	# Header for chosen song
+	# Header for chosen song (evil)
 	if (/<th \s* class=dthp \s* colspan=2>&nbsp<\/th>/x) {
-		printf "UPDATE rounds SET chosensongs=chosensongs+1 WHERE \n";
+		printf "UPDATE rounds SET chosensongs=1 WHERE \n";
 		print "  tournament=(SELECT tournament FROM tournaments WHERE name='$name') AND \n";
 		print "  round=$round;\n";
 	}