use HTTP::Request;
use IO::File;
use POSIX;
-use LWP::UserAgent;
use XML::Parser;
use Commods;
$info.=
sprintf("%-13.13s| %-19.19s %4d| %-19.19s %4d|%3d x%3d =%3d\n",
$commod,
- $buys[0]{Stall},$buys[0]{Price},
$sells[0]{Stall},$sells[0]{Price},
+ $buys[0]{Stall},$buys[0]{Price},
$qty, $pricediff, $tprofit);
sub arb_subtract_qty (\@) {
my ($verbs) = @_;
my $verb= shift @$verbs;
+ my $vqty= $verb->{Qty};
+ $vqty =~ s/^\>//;
unshift @$verbs, {
Stall => $verb->{Stall},
Price => $verb->{Price},
- Qty => $verb->{Qty} - $qty
+ Qty => $vqty - $qty
};
}
arb_subtract_qty(@buys);
our ($pctb) = $ENV{'YPPSC_YARRG_PCTB'};
-our ($ua)= LWP::UserAgent->new;
+our ($ua)= http_useragent("commod-results-processor $mode");
sub refresh_commodmap() {
die unless $pctb;
my $content= $resp->content;
# print STDERR "[[[$content]]]\n";
- $xp->parse($content);
+ my $commodmapxmltmp= '_commodmap.xml';
+ if (!eval {
+ $xp->parse($content); 1;
+ }) {
+ open R, ">./$commodmapxmltmp" or die $!;
+ print R $content or die $!;
+ close R or die $!;
+ die "$@ parsing commodmap";
+ }
+ unlink $commodmapxmltmp or $!==&ENOENT or die $!;
close $o or die $!;
rename "_commodmap.tsv.tmp","_commodmap.tsv" or die $!;
}
return pipethrough_run($tf,undef,'gzip','gzip');
}
-sub main__uploadyaarg () {
+sub main__uploadyarrg () {
my %o;
parse_info_clientside();
$o{'ocean'}= $ENV{'YPPSC_OCEAN'} or die;
$o{'island'}= $ENV{'YPPSC_ISLAND'} or die;
- $o{'timestamp'}= 10;
- get_our_version(\%o, 'client');
+ $o{'timestamp'}= $ENV{'YPPSC_DATA_TIMESTAMP'} or die;
my $tf= pipethrough_prep();
write_tsv($tf);
Content_Type => 'application/octet-stream',
Content => $oz ];
- my $dest= $ENV{'YPPSC_YARRG_YARRG'};
-
- my $respcontent= cgipostform($ua, "$dest/commod-update-receiver", \%o);
+ my $respcontent= yarrgpostform($ua, \%o);
$respcontent =~ m/^OK\b/ or die "$respcontent ?";
+ $respcontent =~ s/^/ /mg;
+ print $respcontent,"\n";
}
sub main__uploadpctb () {