X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fcommod-results-processor;h=36804d35d64c34f25f07fbb22a0de06ad8ee9454;hp=bb0724d0d81e0c26204152879d45f605a7b64c1e;hb=20bea992a857ea1f03f19d81f7164b113a560e83;hpb=50f89febae7a974cafacac26280c4d123b4ff97a

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index bb0724d..36804d3 100755
--- a/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@ -29,7 +29,6 @@ use strict (qw(vars));
 use HTTP::Request;
 use IO::File;
 use POSIX;
-use LWP::UserAgent;
 use XML::Parser;
 
 use Commods;
@@ -129,8 +128,8 @@ sub main__arbitrage () {
 	    $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) = @_;
@@ -230,7 +229,7 @@ sub main__tsv () {
 
 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;
@@ -288,7 +287,16 @@ sub refresh_commodmap() {
     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 $!;
 }