X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fparsealliances.pl;h=f42414ba53f3d755a04188fb8ebb2c9102c17592;hb=6a03c42459329f8c3f6ddc96cf91e508a6d71c90;hp=f8daeaf40d961d2ba5b0c7eff01517c23c0a749d;hpb=13e3df1e4218c19325ef732a4a2cb2b7db79a69c;p=ndwebbie.git

diff --git a/scripts/parsealliances.pl b/scripts/parsealliances.pl
index f8daeaf..f42414b 100755
--- a/scripts/parsealliances.pl
+++ b/scripts/parsealliances.pl
@@ -27,15 +27,14 @@ 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;
@@ -62,7 +61,7 @@ for my $i (3,4){
 		$alliance->[$i+2] = $rank;
     }
 }
-my $insert = $dbh->prepare(q{INSERT INTO alliance_stats (tick,id,members,
+my $insert = $dbh->prepare(q{INSERT INTO alliance_stats (tick,aid,members,
 	size,score,
 	sizerank,scorerank,
 	size_gain,score_gain,
@@ -72,7 +71,7 @@ my $insert = $dbh->prepare(q{INSERT INTO alliance_stats (tick,id,members,
 	members_gain,members_gain_day
 	) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)}) or die $dbh->errstr;
 
-my $findalliance = $dbh->prepare(q{SELECT tick,id,members,
+my $findalliance = $dbh->prepare(q{SELECT tick,aid,members,
 	size, score,
 	sizerank, scorerank,
 	size_gain, score_gain,
@@ -80,7 +79,9 @@ my $findalliance = $dbh->prepare(q{SELECT tick,id,members,
 	size_gain_day, score_gain_day,
 	sizerank_gain_day, scorerank_gain_day,
 	members_gain,members_gain_day
-FROM alliance_stats WHERE id = $1 AND tick < $2 ORDER BY tick DESC LIMIT 1}) or die $dbh->errstr;
+FROM alliance_stats WHERE aid = $1 AND tick < $2 ORDER BY tick DESC LIMIT 1}) or die $dbh->errstr;
+
+$dbh->do(q{DELETE FROM alliance_stats WHERE tick = $1},undef,$tick);
 
 for my $alliance (@alliances) {