# clientfixes "lastpage" [space separated list]
# data filename=deduped.tsv.gz output of ypp-commodities --tsv
+
use strict (qw(vars));
use POSIX;
use MIME::Entity;
my $now= time; defined $now or die $!;
fail("clock skew") if $o{'timestamp'} >= $now;
-die if $o{'ocean'} =~ m/\=/;
-die if $o{'island'} =~ m/\=/;
-
my $indatafh= upload('data');
defined $indatafh or fail("data is not a file");
my $datafile= must_param('data',"^(deduped\\.tsv\\.gz)\$");
get_our_version(\%o, 'server');
foreach my $cs (qw(client server)) {
- $o{"${cs}spec"}= join ' ', map { $o{$cs.$_} } qw(name version fixes);
+ $o{"${cs}spec"}= join "\t", map { $o{$cs.$_} } qw(name version fixes);
+}
+
+my $metadata= '';
+
+sub ksmap ($) {
+ my ($v) = @_;
+ my $i=0; grep { return $i if $_ eq $v; $i++ } qw(ocean island timestamp);
+ sprintf "z %d %s", (length $v) / 8, $v;
}
-foreach my $vn (sort keys %o) {
- my $mpart= MIME::Entity->build(Type => 'text/plain',
- Charset => 'utf-8',
- Disposition => 'inline',
- Data => $o{$vn});
- $mcontent->add_part($mpart);
+foreach my $vn (sort { ksmap($a) cmp ksmap($b) } keys %o) {
+ my $val= $o{$vn};
+ die if $val =~ m/\n|\r/;
+ $metadata .= "$vn\t$o{$vn}\n";
}
+my $mdpart= MIME::Entity->build(Top => 0,
+ Type => 'text/plain',
+ Charset => 'utf-8',
+ Disposition => 'inline',
+ Encoding => 'quoted-printable',
+ Filename => 'metadata',
+ Data => $metadata);
+$mcontent->add_part($mdpart);
+
my $gunzchild= open(GZ, "-|"); defined $gunzchild or die $!;
if (!$gunzchild) {
open STDIN, "<&=", $indatafh or die $!;
exec 'gunzip'; die $!;
}
-sub bad_data ($) { fail("bad data: line $.: $_[0]"); }
-
-our %done;
-
while (<GZ>) {
- !m/\P{IsPrint}/ or die bad_data('nonprinting char(s)');
- !m/\\/ or bad_data('data contains backslashes');
- my @v= split /\t/;
- @v==6 or bad_data('wrong number of fields');
- my ($commod,$stall) = @v;
- defined $commods{$commod} or bad_data("unknown commodity \`$commod'");
- $stall =~ m/^\p{IsUpper}|^[0-9]/ or bad_data("stall not capitalised");
- !exists $done{$commod,$stall} or bad_data("repeated data");
- $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");
- }
+ check_tsv_line($_,\&fail);
}
GZ->error and die $!;
$?=0; close GZ; $? and fail("gunzip for check failed code $?");
-my $mdatafile= MIME::Entity->build(Type => 'application/octet-stream',
+my $mdatafile= MIME::Entity->build(Top => 0,
+ Type => 'application/octet-stream',
Disposition => 'attachment',
Encoding => 'base64',
- File => $datafile);
+ Filename => 'deduped.tsv.gz',
+ Path => $datafile);
$mcontent->add_part($mdatafile);
-open M, "|/usr/sbin/sendmail -t -oi -oee -odq"
+open M, "|/usr/sbin/sendmail -t -oi -oee -odb"
or fail("fork sendmail failed! ($!)");
$mcontent->print(\*M);
M->error and fail("write sendmail failed! ($!)");
$?=0; close M; $? and fail("sendmail failed code $?");
+
+print header(-type=>'text/plain', -charset=>'us-ascii'),
+ "OK\n"
+ or die $!;