X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2FCommods.pm;h=7d9a0beb76dabe5bdedcdd69ced7ed2ea1b68351;hb=9d525e44bd9642a72eb7acd81bd9956b014e3872;hp=6f3a177ee8870c8ca471521058c4b4d1b0d20728;hpb=3c3e5dc8eae9b239f2dab871a3bd47222af09538;p=ypp-sc-tools.web-live.git

diff --git a/pctb/Commods.pm b/pctb/Commods.pm
index 6f3a177..7d9a0be 100644
--- a/pctb/Commods.pm
+++ b/pctb/Commods.pm
@@ -1,6 +1,7 @@
 
 package Commods;
 use IO::File;
+use HTTP::Request::Common ();
 
 use strict;
 use warnings;
@@ -10,15 +11,21 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(&parse_masters %oceans %commods
-		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap);
+    @EXPORT      = qw(&parse_masters %oceans %commods %clients
+		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
+		      &get_our_version &check_tsv_line
+		      &pipethrough_prep &pipethrough_run
+		      &pipethrough_run_along &pipethrough_run_finish
+		      &pipethrough_run_gzip
+		      &cgipostform);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
 
-our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources
+our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources;
 our %commods; # eg $commods{'Fine black cloth'}= $sources;
+our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ];
 # $sources = 's[l]b';
 #       's' = Special Circumstances; 'l' = local ; B = with Bleach
 
@@ -50,6 +57,13 @@ sub parse_master_master1 ($$) {
 		    $oceans{$ocean}{$arch}{$_} .= $src;
 		};
 	    });
+	} elsif (m/^client (\S+.*\S)$/) {
+	    my $client= $1;
+	    $clients{$client}= [ ];
+	    @ctx= (sub {
+		my $bug= $_;
+		push @{ $clients{$client} }, $bug;
+	    });
 	} elsif (s/^ +//) {
 	    my $indent= length $&;
 	    die "wrong indent $indent" unless defined $ctx[$indent-1];
@@ -100,4 +114,118 @@ sub parse_pctb_commodmap () {
     return 1;
 }
 
+sub get_our_version ($$) {
+    my ($aref,$prefix) = @_;
+    $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
+    $aref->{"${prefix}fixes"}= 'lastpage';
+
+    my $version= `git-describe --tags HEAD`; $? and die $?;
+    chomp($version);
+    $aref->{"${prefix}version"}= $version;
+    return $aref;
+}
+
+sub pipethrough_prep () {
+    my $tf= IO::File::new_tmpfile() or die $!;
+    return $tf;
+}
+
+sub pipethrough_run_along ($$$@) {
+    my ($tf, $childprep, $cmd, @a) = @_;
+    $tf->flush or die $!;
+    $tf->seek(0,0) 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= <$pt>; }
+    defined $r or die $!;
+    pipethrough_run_finish($pt);
+    return $r;
+}
+sub pipethrough_run_gzip ($) {
+    pipethrough_run($_[0],undef,'gzip','gzip');
+}
+
+sub cgipostform ($$$) {
+    my ($ua, $url, $form) = @_;
+    my $req= HTTP::Request::Common::POST($url,
+					 Content => $form,
+					 Content_Type => 'form-data');
+    if ($url =~ m,^\.?/,) {
+	my $tf= pipethrough_prep();
+	print $tf $req->content() or die $!;
+#print STDERR "[[[",$req->content(),"]]]";
+	my $out= pipethrough_run($tf, sub {
+	    $ENV{'REQUEST_METHOD'}= 'POST';
+	    $ENV{'QUERY_STRING'}= '';
+	    $ENV{'PATH_TRANSLATED'}= $url;
+	    $ENV{'PATH_INFO'}= '';
+	    $ENV{'HTTP_HOST'}= 'localhost';
+	    $ENV{'REMOTE_ADDR'}= '127.0.0.1';
+	    $ENV{'GATEWAY_INTERFACE'}= 'CGI/1.1';
+	    $ENV{'DOCUMENT_ROOT'}= '.';
+	    $ENV{'SCRIPT_FILENAME'}= $url;
+	    $ENV{'SCRIPT_NAME'}= $url;
+	    $ENV{'HTTP_USER_AGENT'}= 'Commods.pm local test';
+
+	    foreach my $f (qw(Content_Length Content_Type)) {
+		$ENV{uc $f}= $req->header($f);
+	    }
+#system 'printenv >&2';
+	}, "$url", "$url");
+	$out =~ s/\r\n/\n/g;
+	$out =~ m,^Content-Type: text/plain.*\n\n, or die "$out ?";
+	return $';
+    } else {
+	my $resp= $ua->request($url,$req);
+	die $resp->status_line unless $resp->is_success;
+	return $resp->content();
+    }
+}
+
+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;