X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommods.pm;h=42670342372f8dfbc20f24d063e74d796c041f4b;hb=4e9907898a9a02423b6ced7654e39f970df99bbd;hp=bce9a8e13b2cb33afd05feb7ada3d2410aa5ea02;hpb=5b0690cc2d23aa69180aea98397d4ad44b528559;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index bce9a8e..4267034 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -425,14 +425,15 @@ sub check_tsv_line ($$) {
     $l !~ m/\P{IsPrint}/ or &$bad_data('nonprinting char(s)');
     my @v= split /\t/, $l, -1;
     @v==6 or &$bad_data('wrong number of fields');
+    $v[1] =~ s/^\s+//; $v[1] =~ s/\s+$//; # ooo don't check :-(
     my ($commod,$stall) = @v;
 
     !keys %commods or
 	defined $commods{$commod} or
 	&$bad_data("unknown commodity ".errsan($commod));
     
-    $stall =~ m/^\p{IsUpper}|^[0-9]/ or
-	&$bad_data("stall not capitalised ".errsan($stall));
+    $stall =~ m/^\p{IsAlnum}/ or
+	&$bad_data("stall does not start with alphanumeric ".errsan($stall));
     !exists $check_tsv_done{$commod,$stall} or
 	&$bad_data("repeated data ".errsan($commod).",".errsan($stall));
     $check_tsv_done{$commod,$stall}= 1;