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

diff --git a/scripts/parsegalaxies.pl b/scripts/parsegalaxies.pl
index af9d6ec..f9b6af7 100755
--- a/scripts/parsegalaxies.pl
+++ b/scripts/parsegalaxies.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;
@@ -46,7 +45,7 @@ my @galaxies;
 if (@_ = $dumps->fetchrow){
 	$_ = $_[0];
 	$hour = (gmtime($_[1]))[2];
-	while (m/(\d+)\t(\d+)\t\"(?:.+)\"\t(\d+)\t(\d+)\t(\d+)\t(\d+)/g){
+	while (m/(\d+)\t(\d+)\t\"(?:.*)\"\t(\d+)\t(\d+)\t(\d+)\t(\d+)/g){
 		push @galaxies,[$tick,$1,$2,$3,$4,$5,$6,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
 	}
 }
@@ -78,6 +77,7 @@ my $insert = $dbh->prepare(q{INSERT INTO galaxies(tick, x, y,
 	sizerank_gain_day, scorerank_gain_day, valuerank_gain_day, xprank_gain_day,
 	planets,planets_gain,planets_gain_day
 	) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
+$dbh->do(q{DELETE FROM galaxies WHERE tick = $1},undef,$tick);
 my $countplanets = $dbh->prepare(q{SELECT count(*) from planet_stats where x = $1 and y = $2 and tick = $3});
 for my $galaxy (@galaxies) {