X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=parse%2Fparse-ddreurope-tournament.pl;h=592a8e78b3656fb1169625285151440d4a5dbf5d;hp=3f75c41ec2926a3728ba69161a180cfece04ae7e;hb=bd55f6835567a11e5a490d4a872bc778c96d1e83;hpb=4357baa5539a086b35a26c70f5e27844e739e14f

diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 3f75c41..592a8e7 100644
--- a/parse/parse-ddreurope-tournament.pl
+++ b/parse/parse-ddreurope-tournament.pl
@@ -1,4 +1,4 @@
-h#! /usr/bin/perl
+#! /usr/bin/perl
 use strict;
 use warnings;
 use Date::Manip;
@@ -24,10 +24,12 @@ while (<>) {
             /x) {
 		my ($country, $location, $date, $mix, $system) = ($1, $2, $3, $4, $5);
 		$mix =~ s/Euromix/EuroMix/;
+		$mix =~ s/Dance Dance Revolution 8th mix - Extreme/DDR Extreme/;
+		$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'  AND season=( 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";
@@ -51,7 +53,7 @@ while (<>) {
 	}
 
 	# Player's results (score)
-	if (/<td \s* class=dtdm>/x) {
+	if (/<td \s* class=dtd (?: m | song ) >/x) {
 		my $i = 0;
 
 		# random songs
@@ -74,7 +76,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'  AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\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";
@@ -146,7 +148,7 @@ 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' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
@@ -155,6 +157,23 @@ while (<>) {
 		print "   $points);\n";
 	}
 
+	# Odd split first places and stuff
+	if (/^ \s+ ( .*? \s+ and \s+ .*? <\/a>) \s+ won/x) {
+		my $winners = $1;
+		while ($winners =~ s/<a \s+ href= .*? class="link"> (.*?) <\/a>//x) {
+			my $nick = $1;
+			my $points = 'NULL';
+
+			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' 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";
+		}
+	}
+
 	# All other places
 	while (s/(\d+) (?: st | nd | rd | th ) \s* place: .*? class="link"> (.*?) <\/a> \s* (?: got \s* (\d+) \s* point )?//x) {
 		my $ranking = $1;	
@@ -165,7 +184,7 @@ 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' AND season=( SELECT season FROM seasons WHERE seasonname='$season' )),\n";
@@ -210,5 +229,20 @@ sub song_map {
 	$song =~ s/Luv To Me/Luv to Me (AMD Mix)/;
 	$song =~ s/20 November/20th November/;
 
+	$song =~ s/Love Shine/LOVE \xe2\x9d\xa4 SHINE/;
+	$song =~ s/Long Train Running/LONG TRAIN RUNNIN'/;
+	$song =~ s/Door of Magic/Mahou no Tobira (Theme Of Space Maco) [Door of Magic]/;
+	$song =~ s/True -trance sunrise mix-/true... ~trance sunrise mix~/;
+	$song =~ s/Rhythm and Police/RHYTHM AND POLICE (K.O.G G3 Mix)/;
+	$song =~ s/Burnin the floor -momo mix-/BURNIN' THE FLOOR (MOMO MIX)/;
+	$song =~ s/Senorita -speedy mix-/SENORITA (Speedy Mix)/;
+	$song =~ s/Drop out -remix-/DROP OUT (FROM NONSTOP MEGAMIX)/;
+	$song =~ s/57 metallic gray/Heaven is a '57 metallic gray (gimmix)/;
+	$song =~ s/Brilliant 2 U/BRILLIANT 2U/;
+	$song =~ s/Blue Impulse/Aoi Shoudou (for EXTREME) [Blue Impulse]/;
+	$song =~ s/Sobakasu \(Freckles\)/SOBAKASU FRECKLES/;
+	$song =~ s/Synchronized Love/SYNCHRONIZED LOVE (Red Monster Hyper Mix)/;
+	$song =~ s/Orion\.78 -civ mix-/ORION .78 (civilization mix)/;
+
 	return $song;
 }