Change database structure for planets and alliances + PG 8.4 changes

[ndwebbie.git] / scripts / parsegalaxies.pl

diff --git a/scripts/parsegalaxies.pl b/scripts/parsegalaxies.pl
index af9d6ec04c102ace12e47b9a8f3ac30dcdf09104..561b244f4b97de34a970f5afba9f31a80c039f88 100755 (executable)
--- a/scripts/parsegalaxies.pl
+++ b/scripts/parsegalaxies.pl
@@ -27,7 +27,8 @@ 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;
@@ -46,7 +47,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];
        }
 }