From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Tue, 9 Jun 2009 18:48:23 +0000 (+0100)
Subject: New non-broken commodmap XML
X-Git-Tag: 1.9.2~124^2~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=4fac35d62ce44312ff9f36b279495fd22fb731b2;ds=sidebyside

New non-broken commodmap XML
---

diff --git a/pctb/yppsc-commod-processor b/pctb/yppsc-commod-processor
index 2083be1..0eb5056 100755
--- a/pctb/yppsc-commod-processor
+++ b/pctb/yppsc-commod-processor
@@ -235,7 +235,7 @@ sub load_commodmap() {
 
 sub refresh_commodmap() {
     my $ua= LWP::UserAgent->new;
-    my $resp= $ua->get("$pctb/commodmap.php");
+    my $resp= $ua->get("$pctb/commodmap.php?version=2");
     die $resp->status_line unless $resp->is_success;
 
     my $cdata='';
@@ -287,9 +287,6 @@ sub refresh_commodmap() {
 	 }) or die;
     my $content= $resp->content;
 
-    # hacks to strip off drivel that seems to have been added!
-    $content =~ s/^.*\n(\<\?xml)/$1/s;
-    $content =~ s/\<\/body\>.*//s;
 #    print STDERR "[[[$content]]]\n";
     $xp->parse($content);
     close $o or die $!;