yoweb-scrape: apply rate limiter per http:// site

[ypp-sc-tools.main.git] / yarrg / Commods.pm

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index af03a6497b9a7760be5b55cbee867680ffd2d25a..f3ae56fcbd0e4827c2168f6ebd3f15cdc070a6b2 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -222,7 +222,7 @@ sub parse_info1 ($$$) {
                    $ordval= $1;
                    $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e;
                } elsif ($prop =~ m/^\!([a-z]+)$/) {
-                   $c->{Flags} .= $prop;
+                   $c->{Flags} .= $1;
                } else {
                    die "unknown property $prop for $ucname";
                }
@@ -431,8 +431,8 @@ sub check_tsv_line ($$) {
        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;