X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=parse%2Fparse-ddreurope-tournament.pl;h=5773f13648428f863d5d2e7953573683cc873a78;hp=09f428ab35a1d8adcb2efad160f12e3cfdb6ab77;hb=f24e4feebe4555e63b5c5df1090f1982fed89f58;hpb=147774d67c3932c9ee5e42b93f348c5023d74f4b
diff --git a/parse/parse-ddreurope-tournament.pl b/parse/parse-ddreurope-tournament.pl
index 09f428a..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";
@@ -59,10 +59,11 @@ while (<>) {
# random songs
while (s/| (\d+) <\/td>//x) {
- printf "INSERT INTO scores (tournament, round, parallel, player, song, chosen, score) VALUES (\n";
- print " (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+ printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\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";
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/ | .*? class="link"> (.*?) <\/a> .*? | (\d+) <\/td>//x) {
+ while (s/ | .*? class="link"> (.*?) <\/a> .*? | (\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";
- print " (SELECT tournament FROM tournaments WHERE name='$name'),\n";
+ printf "INSERT INTO scores (tournament, round, parallel, player, songnumber, song, chosen, score) VALUES (\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";
print " (SELECT song FROM songs WHERE lower(title)=lower('$song')),\n";
print " 't',\n";
- print " $2);\n";
+ print " $score);\n";
+ ++$i;
}
}
@@ -90,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
}
@@ -104,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
@@ -117,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";
@@ -125,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>/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";
}
@@ -162,6 +166,16 @@ sub song_map {
$song =~ s/Burning the floor/Burnin' the Floor/;
$song =~ s/Never Gonna Make/Never Gonna Make (Factory Team Mix)/;
$song =~ s/Max300/Max 300/;
+ $song =~ s/Era/era (nostalmix)/;
+ $song =~ s/Electro Tuned/Electro Tuned (the SubS Mix)/;
+ $song =~ s/Make a Jam/Make A Jam!/;
+ $song =~ s/Paranoia KCET -clean mix-/Paranoia KCET (Clean Mix)/;
+ $song =~ s/Cant Stop -Speed Mix-/Can't Stop Fallin' in Love (SPEED MIX)/;
+ $song =~ s/Love This Feelin/Love This Feelin'/;
+ $song =~ s/Trip Machine -Luv mix-/Trip Machine (Luv Mix)/;
+ $song =~ s/Let The Beat Hit Them/Let the Beat Hit 'em!/;
+ $song =~ s/Luv To Me/Luv to Me (AMD Mix)/;
+ $song =~ s/20 November/20th November/;
return $song;
}
|