From 02cffbdd44754378b27e1b87a1998368c1098973 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Sat, 9 May 2009 14:42:22 +0200
Subject: [PATCH] getScans and fixed typo

---
 Scans.pm | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/Scans.pm b/Scans.pm
index 038286b..9349838 100644
--- a/Scans.pm
+++ b/Scans.pm
@@ -25,7 +25,7 @@ require Exporter;
 
 our @ISA = qw/Exporter/;
 
-our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs/;
+our @EXPORT = qw/addScan addScanGroup sendScan reqScan scanReqs getScan/;
 
 sub addScan {
 	my ($id,$verbose) = @_;
@@ -190,9 +190,56 @@ sub scanReqs {
 			$text .= "$ND::B$req->{id}$ND::O http://game.planetarion.com/waves.pl?id=$scantypes{$req->{type}}&x=$req->{x}&y=$req->{y}&z=$req->{z} "
 		}
 
-		$text = 'No unhandled reqests.' unless $text;
+		$text = 'No unhandled requests.' unless $text;
 		$ND::server->command("notice $ND::nick $text");
 	}
 }
 
+sub getScan {
+	my ($msg, $command) = @_;
+
+	my ($t, $x, $y, $z, $type, $tick);
+	if (defined $msg && $msg =~ /^([pdunja]) (\d+)\D+(\d+)\D+(\d+)(?: (\d+))?/){
+		$t = $1;
+		$type =$scantypes[$scanid{$1}-1];
+		($x,$y,$z) = ($2,$3,$4);
+		$tick = $5;
+	}else{
+		$ND::server->command("notice $ND::nick syntax: $command type X:Y:Z [tick]"
+			. " | type is the first character in the scan name, like p for planet scan."
+			. " Specify a tick if you want scans older than the specified tick."
+		);
+		return;
+	}
+
+	if (my $user = member){
+		my $scan = $ND::DBH->selectrow_hashref(q{
+SELECT id, scan_id, tick FROM scans
+WHERE type = $1 AND planet = planetid($2,$3,$4,0) AND COALESCE(tick < $5,TRUE)
+ORDER BY tick DESC LIMIT 1
+			},undef,$type,$x,$y,$z,$tick);
+		unless ($scan->{id}){
+			$ND::server->command("notice $ND::nick No such scan");
+		}
+		my $text = '|';
+		if ($t =~ /[uja]/){
+			my $fid = $ND::DBH->selectrow_array(q{
+SELECT fid FROM fleet_scans WHERE id = $1
+				},undef,$scan->{id});
+			my $ships = $ND::DBH->prepare(q{
+SELECT ship,amount FROM fleet_ships WHERE fid = $1 ORDER BY num
+				});
+			$ships->execute($fid);
+			while (my $ship = $ships->fetchrow_hashref){
+				$text .= " $ship->{ship} $ship->{amount} |"
+			}
+		}else{
+			$text = "http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}";
+		}
+		$ND::server->command("notice $ND::nick $ND::B$type$ND::O scan of $x:$y:$z "
+			. "($scan->{scan_id} pt: $ND::B$scan->{tick}$ND::O) $text");
+	}
+}
+
+
 1;
-- 
2.39.2