From: Michael Andreen <harv@ruin.nu>
Date: Wed, 24 Jan 2007 19:16:15 +0000 (+0000)
Subject: show cluster
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=12875f719b2b7283dfc7609fb2d90ecd2016b62e;hp=46de469b2264dd5552b1f2c1c2606d58a2123964;p=NDIRC.git

show cluster
---

diff --git a/Def.pm b/Def.pm
index acf8f57..1f9c7d9 100644
--- a/Def.pm
+++ b/Def.pm
@@ -130,17 +130,19 @@ sub defcall {
 		my $call = "";
 		if ($callnr){
 			my $st = $ND::DBH->prepare(q{
-	SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype, dc.username
+	SELECT c.landing_tick - (SELECT value::integer FROM misc WHERE id = 'TICK'), concat(i.shiptype||'/') AS shiptype, p.x
 	FROM calls c 
 		JOIN incomings i ON i.call = c.id
 		LEFT OUTER JOIN users dc ON dc.uid = c.dc
+		JOIN users u ON u.uid = c.member
+		JOIN current_planet_stats p ON u.planet = p.id
 	WHERE not covered AND c.id = ?
-	GROUP BY c.id,c.landing_tick,dc.username
+	GROUP BY c.id,c.landing_tick,p.x
 	ORDER BY c.landing_tick;
 			});
 			if (my @row = $ND::DBH->selectrow_array($st,undef,$callnr)){
 				chop($row[1]);
-				$call = "(Anti $row[1] ETA: $row[0])"
+				$call = "(Anti $row[1] ETA: $row[0] Cluster: $row[2])"
 			}
 		}
 		$ND::server->command("notice $ND::memchan DEFENSE REQUIRED!! WAKE UP!!");