X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fparsegalaxies.pl;h=0ba0f0cb160df372c08ed88ad182cc6ecb412e15;hb=2480aa768f9864e51d7ae3514b9f0acec89d9e08;hp=af9d6ec04c102ace12e47b9a8f3ac30dcdf09104;hpb=13e3df1e4218c19325ef732a4a2cb2b7db79a69c;p=ndwebbie.git diff --git a/scripts/parsegalaxies.pl b/scripts/parsegalaxies.pl index af9d6ec..0ba0f0c 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]; } }