From b07e4fe93e809a8c555fd51b89a6a82a722441a5 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Thu, 14 Dec 2006 21:04:19 +0000
Subject: [PATCH] coords field implemented

---
 intel.pl             | 27 +++++++++++++++++++++++++--
 templates/intel.tmpl | 12 ++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/intel.pl b/intel.pl
index 30b6cf8..d596957 100644
--- a/intel.pl
+++ b/intel.pl
@@ -28,7 +28,7 @@ $ND::TEMPLATE->param(TITLE => 'Intel');
 die "You don't have access" unless isIntel() || isHC();
 
 my $planet;
-if (param('coords') =~ /(\d+)(?: |:)(\d+)(?: |:)(\d+)/){
+if (param('coords') =~ /^(\d+)(?: |:)(\d+)(?: |:)(\d+)$/){
 	my $query = $DBH->prepare(q{SELECT x,y,z,coords(x,y,z),id, nick, alliance,alliance_id, planet_status,channel FROM current_planet_stats
 WHERE  x = ? AND y = ? AND z = ?});
 	$planet = $DBH->selectrow_hashref($query,undef,$1,$2,$3);
@@ -38,7 +38,30 @@ my $showticks = 'AND (i.tick - i.eta) > (tick() - 48)';
 if (param('show') eq 'all'){
 	$showticks = '';
 }elsif (param('show') =~ /^(\d+)$/){
-	$showticks = "AND (i.tick - i.eta) > tick() - $1";
+	$showticks = "AND (i.tick - i.eta) > (tick() - $1)";
+}
+
+if (param('cmd') eq 'coords'){
+	my $coords = param('coords');
+	$DBH->do(q{CREATE TEMPORARY TABLE coordlist (
+	x integer NOT NULL,
+	y integer NOT NULL,
+	z integer NOT NULL,
+	PRIMARY KEY (x,y,z)
+		)});
+	my $insert = $DBH->prepare(q{INSERT INTO coordlist (x,y,z) VALUES(?,?,?)});
+	while ($coords =~ m/(\d+):(\d+):(\d+)/g){
+		$insert->execute($1,$2,$3);
+	}
+	my $planets = $DBH->prepare(q{SELECT (((p.x || ':') || p.y) || ':') || p.z AS coords, alliance FROM current_planet_stats p
+	JOIN coordlist c ON p.x = c.x AND p.y = c.y AND p.z = c.z
+ORDER BY alliance, p.x, p.y, p.z});
+	$planets->execute;
+	my @planets;
+	while (my $planet = $planets->fetchrow_hashref){
+		push @planets,$planet;
+	}
+	$BODY->param(CoordList => \@planets);
 }
 
 if ($planet){
diff --git a/templates/intel.tmpl b/templates/intel.tmpl
index 9ad77d1..4ce53c4 100644
--- a/templates/intel.tmpl
+++ b/templates/intel.tmpl
@@ -6,6 +6,18 @@
 </form>
 <p><a href="index.pl?page=intel<TMPL_IF Coords>&amp;coords=<TMPL_VAR NAME=Coords></TMPL_IF>&amp;show=all">Show all ticks</a></p>
 
+<TMPL_IF CoordList>
+<table>
+	<tr><th>Coords</th><th>Alliance</th></tr>
+	<TMPL_LOOP CoordList>
+	<tr>
+		<td><a href="index.pl?page=intel&amp;coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+		<td><TMPL_VAR NAME=Alliance></td>
+	</tr>
+	</TMPL_LOOP>
+</table>
+</TMPL_IF>
+
 <TMPL_IF Coords>
 <form action="index.pl" method="post">
 	<input type="hidden" name="coords" value="<TMPL_VAR NAME=Coords>"/>
-- 
2.39.2