X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=b7b18a615a2384e0b2dd51b5e0bc3d58fcde916e;hp=5161af2e8a05a121ca690d41662ebd9012bb8c63;hb=bb95133fcfbd4698daa59debdbaa73a4d1e6252a;hpb=e85ef56a3b2eff647efc77e44ba5ba0a19e53393

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 5161af2..b7b18a6 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -37,10 +37,10 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
 		      &parse_info_serverside &parse_info_serverside_ocean
-		      %oceans %commods %clients
+		      %oceans %commods %clients %commodclasses
 		      %vessels %shotname2damage
 		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
-		      &get_our_version &check_tsv_line
+		      &get_our_version &check_tsv_line &errsan
 		      &pipethrough_prep &pipethrough_run
 		      &pipethrough_run_along &pipethrough_run_finish
 		      &pipethrough_run_gzip &http_useragent &version_core
@@ -406,6 +406,12 @@ sub cgipostform ($$$) {
 
 our %check_tsv_done;
 
+sub errsan ($) {
+    my ($value) = @_;
+    $value =~ s/[^-+\'. A-Za-z0-9]/ sprintf "\\x%02x",ord $& /ge;
+    return "\"$value\"";
+}
+
 sub check_tsv_line ($$) {
     my ($l, $bad_data_callback) = @_;
     my $bad_data= sub { &$bad_data_callback("bad data: line $.: $_[0]"); };
@@ -419,15 +425,19 @@ sub check_tsv_line ($$) {
 
     !keys %commods or
 	defined $commods{$commod} or
-	&$bad_data("unknown commodity \`$commod'");
+	&$bad_data("unknown commodity ".errsan($commod));
     
-    $stall =~ m/^\p{IsUpper}|^[0-9]/ or &$bad_data("stall not capitalised");
-    !exists $check_tsv_done{$commod,$stall} or &$bad_data("repeated data");
+    $stall =~ m/^\p{IsUpper}|^[0-9]/ or
+	&$bad_data("stall not capitalised ".errsan($stall));
+    !exists $check_tsv_done{$commod,$stall} or
+	&$bad_data("repeated data ".errsan($commod).",".errsan($stall));
     $check_tsv_done{$commod,$stall}= 1;
     foreach my $i (2..5) {
 	my $f= $v[$i];
-	$f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or &$bad_data("bad field $i");
-	($i % 2) or ($f !~ m/\>/) or &$bad_data("> in field $i price");
+	$f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or
+	    &$bad_data("bad field $i ".errsan($f));
+	($i % 2) or ($f !~ m/\>/) or
+	    &$bad_data("> in field $i price ".errsan($f));
     }
 
     foreach my $i (2,4) {