Updates for round 100

[ndwebbie.git] / lib / NDWeb / Controller / Raids.pm

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index 5248128d43a25c9ee7f77265d6d1fd523d47b30d..e948d66d19a492eb54e2f63a861c5896465b2c8b 100644 (file)
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -610,9 +610,11 @@ WHERE rt.id = $1 AND r.open AND not r.removed
                },undef,$target,$c->user->id));
 
        my $fleets = $dbh->prepare(q{
-SELECT DISTINCT ON (name) name, tick, fid, race
+SELECT DISTINCT ON (name) name, tick, fid, race, race_id
        ,COALESCE($2,score) AS score, COALESCE($2, value) AS value
-FROM fleets LEFT OUTER JOIN current_planet_stats p USING (pid)
+FROM fleets
+       LEFT OUTER JOIN current_planet_stats p USING (pid)
+       LEFT OUTER JOIN races r USING (race)
 WHERE pid = $1 AND mission = 'Full fleet'
 ORDER BY name ASC, tick DESC
                });
@@ -643,9 +645,11 @@ WHERE uid = $1 AND fid = $2
                        },undef,$c->user->id,$fid));
 
        my $fleets = $dbh->prepare(q{
-SELECT DISTINCT ON (name) name, tick, fid, race
+SELECT DISTINCT ON (name) name, tick, fid, race, race_id
        ,score AS score, value AS value
-FROM fleets LEFT OUTER JOIN current_planet_stats p USING (pid)
+FROM fleets
+       LEFT OUTER JOIN current_planet_stats p USING (pid)
+       LEFT OUTER JOIN races r USING (race)
 WHERE pid = $1 AND mission = 'Full fleet'
 ORDER BY name ASC, tick DESC
                });
@@ -654,8 +658,10 @@ ORDER BY name ASC, tick DESC
        $c->stash(def => $fleets->fetchall_arrayref({}));
 
        $fleets = $dbh->prepare(q{
-SELECT tick, fid, race ,score , value
-FROM fleets f LEFT OUTER JOIN current_planet_stats p USING (pid)
+SELECT tick, fid, race, race_id, score, value
+FROM fleets f
+       LEFT OUTER JOIN current_planet_stats p USING (pid)
+       LEFT OUTER JOIN races r USING (race)
 WHERE fid = $1 AND pid = $2
                });
        $fleets->execute($fid, $c->user->planet);
@@ -687,7 +693,6 @@ SELECT id, amount FROM fleet_ships fs JOIN ship_stats s USING (ship)
 WHERE fid = $1
                });
 
-       my %races = (Ter => 1, Cat => 2, Xan => 3, Zik => 4, Etd => 5);
        for ('def','att'){
                my $nrfleets = 0;
                my $tick = 0;
@@ -698,7 +703,7 @@ WHERE fid = $1
                        ++$nrfleets;
                        push @query, "${_}_planet_value_${nrfleets}=$fleet->{value}";
                        push @query, "${_}_planet_score_${nrfleets}=$fleet->{score}";
-                       push @query, "${_}_${nrfleets}_race=$races{$fleet->{race}}";
+                       push @query, "${_}_${nrfleets}_race=$fleet->{race_id}";
                        while (my $ship = $ships->fetchrow_hashref){
                                push @query, "${_}_${nrfleets}_$ship->{id}=$ship->{amount}";
                        }