use lib qw{/var/www/ndawn/};
use ND::Include;
+use ND::DB;
-our $dbh;
-for my $file ("/home/whale/db.pl")
-{
- unless (my $return = do $file){
- warn "couldn't parse $file: $@" if $@;
- warn "couldn't do $file: $!" unless defined $return;
- warn "couldn't run $file" unless $return;
- }
-}
-#$dbh->trace("0","/tmp/parsedumps");
+our $dbh = ND::DB::DB();
$ND::DBH = $dbh;
$_ = $_[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];