X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fparsedumps.pl;h=f1738bf06efd7f54c9c916a08e6be40542250574;hb=568cb31a5cc3b66a03e7f4861fce8592b5528822;hp=106922b4d4d781adbfdea6359ab55a9d3606b852;hpb=c643b311c8f134a59625192b900aa28b3f12d4f1;p=ndwebbie.git diff --git a/scripts/parsedumps.pl b/scripts/parsedumps.pl index 106922b..f1738bf 100755 --- a/scripts/parsedumps.pl +++ b/scripts/parsedumps.pl @@ -27,7 +27,7 @@ use DBD::Pg qw(:pg_types); use LWP::Simple; -use lib qw{/var/www/ndawn/code/}; +use lib qw{/var/www/ndawn/}; use ND::Include; @@ -113,7 +113,7 @@ if (@_ = $dumps->fetchrow){ $_ = $_[0]; $hour = (gmtime($_[1]))[2]; my $planetid = $dbh->prepare(qq{SELECT findplanetid(?,?,?)}); - while (m/(\d+)\t(\d+)\t(\d+)\t\"(.+)\"\t\"(.+)\"\t(Ter|Cat|Zik|Xan|Etd)\t(\d+)\t(\d+)\t(\d+)\t(\d+)/g){ + 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; push @planets,[$tick,$id[0],$1,$2,$3,$7,$8,$9,$10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];