X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=intel.pl;h=5db6f9bdbe1ef9a7fffca368b4fb2324ffb64034;hb=ccf38f8bef1adef7c1ef8797d8c84e477bc82305;hp=2b33c5e4849d19afff8f79f7781aa83ea798f6b4;hpb=0c6242438cc218a6a6980c961484b8c74d547eee;p=ndwebbie.git

diff --git a/intel.pl b/intel.pl
index 2b33c5e..5db6f9b 100644
--- a/intel.pl
+++ b/intel.pl
@@ -18,17 +18,20 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 use POSIX;
 our $BODY;
 our $DBH;
 our $LOG;
+my $error;
 
 $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 +41,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){
@@ -50,7 +76,7 @@ if ($planet){
 					,undef,$value,$planet->{id})){
 				$planet->{nick} = $value;
 			}else{
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
 		if (param('cchannel')){
@@ -59,7 +85,7 @@ if ($planet){
 					,undef,$value,$planet->{id})){
 				$planet->{channel} = $value;
 			}else{
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
 		if (param('cstatus')){
@@ -68,7 +94,7 @@ if ($planet){
 					,undef,$value,$planet->{id})){
 				$planet->{planet_status} = $value;
 			}else{
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
 		if (param('calliance')){
@@ -76,10 +102,10 @@ if ($planet){
 					,undef,param('alliance'),$planet->{id})){
 				$planet->{alliance_id} = param('alliance');
 			}else{
-				print "<p> Something went wrong: ".$DBH->errstr."</p>";
+				$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 			}
 		}
-		$DBH->commit or print "<p> Something went wrong: ".$DBH->errstr."</p>";
+		$DBH->commit or $error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
 	}
 }
 
@@ -109,31 +135,37 @@ if ($planet){
 	$BODY->param(Alliances => \@alliances);
 
 	my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin',"t.id = ? $showticks"));
-	$query->execute($planet->{id}) or print $DBH->errstr;
+	$query->execute($planet->{id}) or $error .= $DBH->errstr;
 	my @intellists;
-	my @intel;
+	my @incomings;
+	my $i = 0;
 	while (my $intel = $query->fetchrow_hashref){
 		if ($intel->{ingal}){
 			$intel->{missionclass} = 'ingal';
 		}else{
 			$intel->{missionclass} = $intel->{mission};
 		}
-		push @intel,$intel;
+		$i++;
+		$intel->{ODD} = $i % 2;
+		push @incomings,$intel;
 	}
-	push @intellists,{Message => 'Incoming fleets', Intel => \@intel, Origin => 1};
+	push @intellists,{Message => 'Incoming fleets', Intel => \@incomings, Origin => 1};
 
-	my $query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks"));
-	$query->execute($planet->{id}) or print $DBH->errstr;
-	my @intel;
+	$query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks"));
+	$query->execute($planet->{id}) or $error .= $DBH->errstr;
+	my @outgoings;
+	$i = 0;
 	while (my $intel = $query->fetchrow_hashref){
 		if ($intel->{ingal}){
 			$intel->{missionclass} = 'ingal';
 		}else{
 			$intel->{missionclass} = $intel->{mission};
 		}
-		push @intel,$intel;
+		$i++;
+		$intel->{ODD} = $i % 2;
+		push @outgoings,$intel;
 	}
-	push @intellists,{Message => 'Outgoing Fleets', Intel => \@intel, Target => 1};
+	push @intellists,{Message => 'Outgoing Fleets', Intel => \@outgoings, Target => 1};
 
 	$BODY->param(IntelLIsts => \@intellists);
 
@@ -143,18 +175,22 @@ if ($planet){
 				OR ( t.alliance_id = o.alliance_id AND i.mission = 'Attack'))
 			AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL)
 			$showticks}));
+	$query->execute() or $error .= $DBH->errstr;
 
 	my @intellists;
 	my @intel;
+	my $i = 0;
 	while (my $intel = $query->fetchrow_hashref){
 		if ($intel->{ingal}){
 			$intel->{missionclass} = 'ingal';
 		}else{
 			$intel->{missionclass} = $intel->{mission};
 		}
+		$i++;
+		$intel->{ODD} = $i % 2;
 		push @intel,$intel;
 	}
-	push @intellists,{Message => q{Missions where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1};
+	push @intellists,{Message => q{Intel where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1};
 	$BODY->param(IntelLIsts => \@intellists);
 }
 my $query = $DBH->prepare(q{SELECT i.id, u.username, i.message, report_date FROM intel_messages i
@@ -167,4 +203,5 @@ while (my $message = $query->fetchrow_hashref){
 	push @messages,$message;
 }
 $BODY->param(IntelMessages => \@messages);
+$BODY->param(Error => $error);
 1;