X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FMain.pm;h=083b96da133a0fb365905090a9661e197b19ccfa;hb=da77e07d9a4ac17a25796a0b897a03f4853ba341;hp=95a85f3770554a31a48db9045b9df640d065ebbb;hpb=fb2bbffe375681514dff83be2f9ed25e0d54bde3;p=ndwebbie.git

diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm
index 95a85f3..083b96d 100644
--- a/NDWeb/Pages/Main.pm
+++ b/NDWeb/Pages/Main.pm
@@ -141,7 +141,7 @@ sub render_body {
 				TRIM('/' FROM concat(DISTINCT race||' /')) AS race, TRIM('/' FROM concat(amount||' /')) AS amount,
 				TRIM('/' FROM concat(DISTINCT eta||' /')) AS eta, TRIM('/' FROM concat(DISTINCT shiptype||' /')) AS shiptype,
 				TRIM('/' FROM concat(coords||' /')) AS attackers 
-			FROM (SELECT c.id,p.x,p.y,p.z, u.defense_points, c.landing_tick, dc.username AS dc,
+			FROM (SELECT c.id,p.x,p.y,p.z, u.defense_points, c.landing_tick, dc.username AS dc,covered,
 				(c.landing_tick - tick()) AS curreta,p2.race, i.amount, i.eta, i.shiptype, p2.alliance,
 				coords(p2.x,p2.y,p2.z),	COUNT(DISTINCT f.id) AS fleets
 			FROM calls c 
@@ -152,8 +152,8 @@ sub render_body {
 			LEFT OUTER JOIN users dc ON c.dc = dc.uid
 			LEFT OUTER JOIN fleets f ON f.target = u.planet AND f.tick = c.landing_tick AND f.back = f.tick + f.eta - 1
 			WHERE u.uid = ? AND c.landing_tick >= tick()
-			GROUP BY c.id, p.x,p.y,p.z, c.landing_tick, u.defense_points,dc.username,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z) a
-			GROUP BY id, x,y,z,landing_tick, defense_points,dc,curreta,fleets
+			GROUP BY c.id, p.x,p.y,p.z, c.landing_tick, u.defense_points,dc.username,covered,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z) a
+			GROUP BY id, x,y,z,landing_tick, defense_points,dc,covered,curreta,fleets
 			ORDER BY landing_tick DESC
 		})or warn  $DBH->errstr;
 	$calls->execute($ND::UID) or warn $DBH->errstr;
@@ -208,15 +208,16 @@ sub render_body {
 	$query = $DBH->prepare(q{SELECT f.id, coords(x,y,z) AS target, mission
 		, f.amount, tick, back
 FROM fleets f 
-JOIN fleet_ships fs USING (id)
 LEFT OUTER JOIN current_planet_stats p ON f.target = p.id
-WHERE f.uid = ? AND f.sender = ? AND 
+WHERE NOT ingal AND f.uid = ? AND f.sender = ? AND 
 	(back >= ? OR (tick >= tick() -  24 AND name = 'Main'))
 GROUP BY f.id, x,y,z, mission, tick,back,f.amount
 ORDER BY x,y,z,mission,tick
 		});
 
-	my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships where id = ?});
+	my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+		WHERe id = ? ORDER BY num
+	});
 
 	$query->execute($self->{UID},$self->{PLANET},$self->{TICK}) or warn $DBH->errstr;
 	my @fleets;