@ISA = qw(Exporter);
@EXPORT = qw(&parse_masters %oceans %commods %clients
&parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
- &get_our_version
+ &get_our_version &check_tsv_line
&pipethrough_prep &pipethrough_run
+ &pipethrough_run_along &pipethrough_run_finish
&pipethrough_run_gzip
&cgipostform);
%EXPORT_TAGS = ( );
my $tf= IO::File::new_tmpfile() or die $!;
return $tf;
}
-
-sub pipethrough_run ($$$@) {
+
+sub pipethrough_run_along ($$$@) {
my ($tf, $childprep, $cmd, @a) = @_;
$tf->flush or die $!;
$tf->seek(0,0) or die $!;
- my $child= open GZ, "-|"; defined $child or die $!;
+ my $fh= new IO::File;
+ my $child= $fh->open("-|"); defined $child or die $!;
if (!$child) {
open STDIN, "<&", $tf;
&$childprep() if defined $childprep;
exec $cmd @a; die $!;
}
+ return $fh;
+}
+sub pipethrough_run_finish ($) {
+ my ($fh)= @_;
+ $fh->error and die $!;
+ close $fh or die "$! $?"; die $? if $?;
+}
+
+sub pipethrough_run ($$$@) {
+ my ($tf, $childprep, $cmd, @a) = @_;
+ my $pt= pipethrough_run_along($tf,$childprep,$cmd,@a);
my $r;
- { undef $/; $!=0; $r= <GZ>; }
+ { undef $/; $!=0; $r= <$pt>; }
defined $r or die $!;
- close GZ or die "$! $?"; die $? if $?;
+ pipethrough_run_finish($pt);
return $r;
}
sub pipethrough_run_gzip ($) {
}
}
+our %check_tsv_done;
+
+sub check_tsv_line ($$) {
+ my ($l, $bad_data_callback) = @_;
+ my $bad_data= sub { &$bad_data_callback("bad data: line $.: $_[0]"); };
+
+ chomp($l) or &$bad_data('missing end-of-line');
+
+ $l !~ m/\P{IsPrint}/ or &$bad_data('nonprinting char(s)');
+ $l !~ m/\\/ or &$bad_data('data contains backslashes');
+ my @v= split /\t/, $l, -1;
+ @v==6 or &$bad_data('wrong number of fields');
+ my ($commod,$stall) = @v;
+
+ !keys %commods or
+ defined $commods{$commod} or
+ &$bad_data("unknown commodity \`$commod'");
+
+ $stall =~ m/^\p{IsUpper}|^[0-9]/ or &$bad_data("stall not capitalised");
+ !exists $check_tsv_done{$commod,$stall} or &$bad_data("repeated data");
+ $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");
+ }
+ return @v;
+}
+
1;