X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRaids.pm;h=c6c1461520f16e50ca90102481a16ae2edac3d73;hb=fa041ffba328c26a58506d5ccabed93d29106473;hp=f2bfa0a0fc526f9d4159a0b46eb3582f60ebbaa6;hpb=b00d7995de3f6eb15560b5ae9dac75f12e248b13;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Raids.pm b/lib/NDWeb/Controller/Raids.pm
index f2bfa0a..c6c1461 100644
--- a/lib/NDWeb/Controller/Raids.pm
+++ b/lib/NDWeb/Controller/Raids.pm
@@ -137,23 +137,22 @@ sub view : Local {
 			#next if ($target->{score}/$planet->{score} < 0.4) && ($target->{value}/$planet->{value} < 0.4);
 		}
 
-		my $unitscans = $dbh->prepare(q{ 
-			SELECT DISTINCT ON (name) i.id,i.name, i.tick, i.amount 
-			FROM fleets i
-			WHERE  i.uid = -1
-				AND i.sender = ?
-				AND i.mission = 'Full fleet'
-			GROUP BY i.id,i.tick,i.name,i.amount
-			ORDER BY name,i.tick DESC
+		my $unitscans = $dbh->prepare(q{
+SELECT DISTINCT ON (name) fid, name, tick, amount
+FROM fleets
+WHERE planet = ?
+	AND mission = 'Full fleet'
+GROUP BY fid,tick,name,amount
+ORDER BY name,tick DESC
 		});
 		$unitscans->execute($target->{planet});
 		my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
-			WHERE id = ? ORDER BY num
+			WHERE fid = ? ORDER BY num
 		});
 		my @missions;
 		while (my $mission = $unitscans->fetchrow_hashref){
 			my @ships;
-			$ships->execute($mission->{id});
+			$ships->execute($mission->{fid});
 			while (my $ship = $ships->fetchrow_hashref){
 				push @ships,$ship;
 			}
@@ -237,7 +236,8 @@ sub edit : Local {
 		$order .= 'p.x,p.y,p.z';
 	}
 
-	my $targetquery = $dbh->prepare(qq{SELECT r.id,coords(x,y,z),comment,size,score,value,race,planet_status AS planetstatus,relationship,comment,r.planet, s.scans
+	my $targetquery = $dbh->prepare(qq{SELECT r.id,coords(x,y,z),comment,size
+		,score,value,race,planet_status,relationship,comment,r.planet, s.scans
 		FROM raid_targets r
 			JOIN current_planet_stats p ON p.id = r.planet
 			LEFT OUTER JOIN ( SELECT planet, array_accum(s::text) AS scans