X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Ffetchdumps.pl;h=b8be1c36ca111561d5054337d18ecba75fc84b9b;hb=83be73d01437ba9841257bb9064314d63fab9487;hp=efd124afc154c7688472c4e6219dab2ecace08e0;hpb=c643b311c8f134a59625192b900aa28b3f12d4f1;p=ndwebbie.git diff --git a/scripts/fetchdumps.pl b/scripts/fetchdumps.pl index efd124a..b8be1c3 100755 --- a/scripts/fetchdumps.pl +++ b/scripts/fetchdumps.pl @@ -27,17 +27,11 @@ use DBD::Pg qw(:pg_types); use LWP::Simple; -$0 =~ /(.*\/)[^\/]/; -my $dir = $1; -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; - } -} +use lib qw{/var/www/ndawn/}; +use ND::DB; + +our $dbh = ND::DB::DB(); + $dbh->do("SET CLIENT_ENCODING TO 'LATIN1';"); my $insert = $dbh->prepare("INSERT INTO dumps(tick,type,modified,dump) VALUES(?,?,?,?)"); @@ -57,8 +51,8 @@ for my $type ("planet","alliance","galaxy"){ } if ($updated){ - `${dir}parsedumps.pl $updated`; - `${dir}ndrank.pl`; + `/var/www/ndawn/scripts/parsedumps.pl $updated`; + `/var/www/ndawn/scripts/ndrank.pl`; $dbh->do("UPDATE misc SET value = ? WHERE id = 'TICK'", undef, $updated); }