From: Michael Andreen <harv@ruin.nu>
Date: Thu, 1 Feb 2007 08:40:55 +0000 (+0000)
Subject: show cluster in .def output
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=c7a30bb9abd991500d3e5a4208c19701031e419d;p=NDIRC.git

show cluster in .def output
---

diff --git a/Members.pm b/Members.pm
index 49485f9..9722328 100644
--- a/Members.pm
+++ b/Members.pm
@@ -32,12 +32,14 @@ sub currentCalls {
 	DB();
 	if (1){ #TODO: add check for member
 		my $f = $ND::DBH->prepare(<<SQL
-	SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype, dc.username
+	SELECT (c.landing_tick - tick()) AS eta, concat(i.shiptype||'/') AS shiptype, dc.username,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 open AND (c.landing_tick - tick()) >= 7
-	GROUP BY c.id,c.landing_tick,dc.username
+	GROUP BY c.id,c.landing_tick,dc.username,p.x
 	ORDER BY c.landing_tick;
 SQL
 );
@@ -46,7 +48,7 @@ SQL
 		while (my @row = $f->fetchrow()){
 			chop($row[1]);
 			my $dc = defined $row[2] ? $row[2] : '';
-			$calls .= " (Anti $row[1] ETA: $row[0] DC: $dc) |"
+			$calls .= " (Anti $row[1] ETA: $row[0] Cluster: $row[3] DC: $dc) |"
 		}
 		chop($calls);
 		if (defined $verbose || length $calls > 0){