Reorganized menu a bit, moving covop and bc menus a bit down

[ndwebbie.git] / scripts / parsegalaxies.pl

diff --git a/scripts/parsegalaxies.pl b/scripts/parsegalaxies.pl
index 7b629f857ae261a8d379504b319b4c0fe86c5839..0ba0f0cb160df372c08ed88ad182cc6ecb412e15 100755 (executable)
--- 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/};
+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];
        }
 }