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=d322c1c7b682638d14c861b573386e97d81cc279;hb=3ca67ce14212ba4421029d7b8db90f03f106c67c;hpb=0da2ddd243bf88c4961cf8a1deb8d174c18976c0

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index d322c1c..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;
@@ -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 $!;
 }