X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=scripts%2Fparseplanets.pl;h=518a887201661cc63a413332e9662e05ff7720e4;hp=e3c013ac1790d5accbfc52a17c309d176b0c837e;hb=36a13cae169413fc04fbf704d94a2ad797336e6e;hpb=13e3df1e4218c19325ef732a4a2cb2b7db79a69c

diff --git a/scripts/parseplanets.pl b/scripts/parseplanets.pl
index e3c013a..518a887 100755
--- a/scripts/parseplanets.pl
+++ b/scripts/parseplanets.pl
@@ -22,20 +22,18 @@ q{
 
 use strict;
 use warnings;
+use local::lib;
 use DBI;
 use DBD::Pg qw(:pg_types);
 
-use LWP::Simple;
-
-use lib qw{/var/www/ndawn/lib/};
+use FindBin;
+use lib "$FindBin::Bin/../lib";
 
 use ND::Include;
 use ND::DB;
 
 our $dbh = ND::DB::DB();
 
-$ND::DBH = $dbh;
-
 my $tick = $ARGV[0];
 my $hour;
 $dbh->begin_work;
@@ -46,7 +44,7 @@ $dumps->execute($tick);
 if (@_ = $dumps->fetchrow){
 	$_ = $_[0];
 	$hour = (gmtime($_[1]))[2];
-	my $planetid = $dbh->prepare(qq{SELECT findplanetid(?,?,?)});
+	my $planetid = $dbh->prepare(q{SELECT find_planet_id($1,$2,$3)});
 	while (m/(\d+)\t(\d+)\t(\d+)\t\"(.*)\"\t\"(.*)\"\t(Ter|Cat|Zik|Xan|Etd)\t(\d+)\t(\d+)\t(\d+)\t(\d+)/g){
 		$planetid->execute($5,$4,$6);
 		my @id = $planetid->fetchrow;
@@ -63,15 +61,15 @@ for my $i (8,7,5,6){
     }
 }
 
-my $findplanets = $dbh->prepare(q{SELECT tick,id, x, y, z, 
-	size, score, value, xp, 
-	sizerank, scorerank, valuerank, xprank, 
-	size_gain, score_gain, value_gain, xp_gain, 
-	sizerank_gain, scorerank_gain, valuerank_gain, xprank_gain, 
-	size_gain_day, score_gain_day, value_gain_day, xp_gain_day, 
+my $findplanets = $dbh->prepare(q{SELECT tick,pid, x, y, z,
+	size, score, value, xp,
+	sizerank, scorerank, valuerank, xprank,
+	size_gain, score_gain, value_gain, xp_gain,
+	sizerank_gain, scorerank_gain, valuerank_gain, xprank_gain,
+	size_gain_day, score_gain_day, value_gain_day, xp_gain_day,
 	sizerank_gain_day, scorerank_gain_day, valuerank_gain_day, xprank_gain_day
 FROM planet_stats WHERE tick = (SELECT MAX(tick) FROM planet_stats WHERE tick < $1)});
-my $insert = $dbh->prepare(q{INSERT INTO planet_stats(tick,id, x, y, z, 
+my $insert = $dbh->prepare(q{INSERT INTO planet_stats(tick,pid, x, y, z,
 	size, score, value,xp,
 	sizerank,scorerank,valuerank,xprank,
 	size_gain, score_gain, value_gain, xp_gain,
@@ -84,6 +82,9 @@ my %oldStats;
 while (my @planet = $findplanets->fetchrow){
 	$oldStats{$planet[1]} = \@planet;
 }
+my $intel = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message) VALUES(
+		(SELECT ftid FROM planets WHERE pid = $2),$1,$3)});
+$dbh->do(q{DELETE FROM planet_stats WHERE tick = $1},undef,$tick);
 for my $planet (@planets) {
 	#print "$planet->[1]\n";
 	my $oldPlanet = $oldStats{$planet->[1]};
@@ -99,7 +100,7 @@ for my $planet (@planets) {
 			($planet->[3] != $oldPlanet->[3]) or 
 			($planet->[4] != $oldPlanet->[4])){
 			#print "Planet has moved from $oldPlanet[2]:$oldPlanet[3]:$oldPlanet[4] to $planet->[2]:$planet->[3]:$planet->[4]\n";
-			intel_log -3, $planet->[1],"Planet has moved from $oldPlanet->[2]:$oldPlanet->[3]:$oldPlanet->[4] to $planet->[2]:$planet->[3]:$planet->[4] tick $tick";
+			$intel->execute(-3, $planet->[1],"Planet has moved from $oldPlanet->[2]:$oldPlanet->[3]:$oldPlanet->[4] to $planet->[2]:$planet->[3]:$planet->[4] tick $tick");
 		}
 	}
 	#print "@{$oldPlanet}\n";