X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fparsedumps.pl;h=d22525fd87b776a83a393db456157ed97ac73507;hb=83be73d01437ba9841257bb9064314d63fab9487;hp=e02c46b82707acefe91e77d039fcd596b4ee72aa;hpb=e38b5c1ae7b6d15124bd8e7044bf7f563185cbf2;p=ndwebbie.git

diff --git a/scripts/parsedumps.pl b/scripts/parsedumps.pl
index e02c46b..d22525f 100755
--- a/scripts/parsedumps.pl
+++ b/scripts/parsedumps.pl
@@ -30,17 +30,9 @@ use LWP::Simple;
 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;
 
@@ -113,7 +105,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];