X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=check.pl;h=04f49d3f4c89cda80677417b1c0baee47a4e67bd;hb=03830799201db0b0f28e9c494fdd1b5b5143749c;hp=9112aa21982b1bc9000c4c01aa6aeca9f9dd708c;hpb=1cb36d8d6abd14abad07e7dc49ed3a8cc396ffaa;p=ndwebbie.git

diff --git a/check.pl b/check.pl
index 9112aa2..04f49d3 100644
--- a/check.pl
+++ b/check.pl
@@ -18,12 +18,14 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
+use ND::Include;
 
 $ND::TEMPLATE->param(TITLE => 'Check planets and galaxies');
 
 our $BODY;
 our $DBH;
-our $LOG;
 
 $BODY->param(isBC => isMember() && (isOfficer() || isBC));
 
@@ -49,7 +51,7 @@ if (isMember() && param('cmd') eq 'arbiter'){
 	}else{
 		$BODY->param(Arbiter => '<b>KILL THESE BASTARDS</b>');
 	}
-	$LOG->execute($ND::UID,"Arbiter check on $x:$y");
+	log_message $ND::UID,"Arbiter check on $x:$y";
 }
 
 my $where = '';
@@ -69,11 +71,12 @@ if (defined $z){
 }else{
 	$query->execute($x,$y);
 	if (isMember() && (isBC() || isOfficer()) && !isHC()){
-		$LOG->execute($ND::UID,"BC browsing $x:$y");
+		log_message $ND::UID,"BC browsing $x:$y";
 	}
 }
 my @planets;
 my $planet_id = undef;
+my $i = 0;
 while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank
 		,$fleetvalue,$resvalue,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){
 	$planet_id = $id;
@@ -88,9 +91,11 @@ while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scoreran
 		$planet{Relationship} = $relationship;
 		$planet{isBC} = 1;
 		if ($z && $alliance eq 'NewDawn'){
-			$LOG->execute($ND::UID,"BC browsing ND planet $coords tick $ND::TICK");
+			log_message $ND::UID,"BC browsing ND planet $coords tick $ND::TICK";
 		}
 	}
+	$i++;
+	$planet{ODD} = $i % 2;
 	push @planets,\%planet;
 }
 $BODY->param(Planets => \@planets);
@@ -118,7 +123,7 @@ ORDER BY p.x,p.y,p.z});
 	$BODY->param(Missions => \@missions);
 
 	my @scans;
-	my $query = $DBH->prepare(q{SELECT value,tick FROM planet_stats 
+	$query = $DBH->prepare(q{SELECT value,tick FROM planet_stats 
 		WHERE id = ? AND tick > tick() - 24});
 	my $scan = q{
 <p>Value the last 24 ticks</p>
@@ -135,8 +140,8 @@ ORDER BY p.x,p.y,p.z});
 	$scan .= q{</table>};
 	push @scans, {Scan => $scan};
 
-	my $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ?});
-	my $scan = q{
+	$query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ?});
+	$scan = q{
 <p>Previous Coords</p>
 <table><tr><th>Tick</th><th>Value</th><th>Difference</th></tr>};
 	$query->execute($planet_id);
@@ -152,7 +157,7 @@ ORDER BY p.x,p.y,p.z});
 	$scan .= q{</table>};
 	push @scans, {Scan => $scan};
 
-	my $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
+	$query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
 		GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
 	$query->execute($planet_id);
 	my %scans;