X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=parse%2Fparse-ddreurope-tournament.pl;h=e3d6ba5fa3992476ce45256755afdb7ee7631d21;hp=b0da713c3ad7523610a6395807122a396867d928;hb=629352f0146f1e096bfe61cb604bbf848145f844;hpb=4ddc2d1937960d5cf4017644a41433eac2f6f391
diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index b0da713..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";
@@ -41,11 +42,8 @@ while (<>) {
if (/^
.*? class="link"> (.*?) <\/a> $/x) {
$player = $1;
- # 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", $player, $player;
-
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";
@@ -54,13 +52,13 @@ while (<>) {
}
# Player's results (score)
- if (/ | /x) {
+ if (/ | /x) {
my $i = 0;
# random songs
while (s/ | (\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";
@@ -77,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";
@@ -94,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
}
@@ -108,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
@@ -121,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";
@@ -129,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>/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";
}
@@ -148,9 +146,14 @@ while (<>) {
# Whoa :-)
$points = 'NULL' unless defined($points);
+ # Woot, evil
+ 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 " 1, '$nick', $points);\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
@@ -162,9 +165,14 @@ while (<>) {
# Whoa :-)
$points = 'NULL' unless defined($points);
+ # Woot, evil
+ 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 " $ranking, '$nick', $points);\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";
}
}
@@ -186,7 +194,7 @@ sub song_map {
$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/Candy \*/Candy/;
+ $song =~ s/Candy \*/Candy\xe2\x98\x86/;
$song =~ s/www\.blondie girl/www.blonde girl (MOMO Mix)/;
$song =~ s/DXY/DXY!/;
$song =~ s/Burning the floor/Burnin' the Floor/;
|
---|