X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fcommod-update-receiver;h=9684c696794996c527c44e2d051747652230ffe6;hb=cf91713ebb03e007c03dc70867c73db3a1a754a9;hp=6fac8a27b688e659682d8d8625e2e0d4e682ace7;hpb=5054fcc355306f2bccdef9ea1aa8fb79488a9561;p=ypp-sc-tools.db-live.git diff --git a/yarrg/commod-update-receiver b/yarrg/commod-update-receiver index 6fac8a2..9684c69 100755 --- a/yarrg/commod-update-receiver +++ b/yarrg/commod-update-receiver @@ -25,20 +25,6 @@ # are used without permission. This program is not endorsed or # sponsored by Three Rings. -# All calls contain: -# clientname "ypp-sc-tools" -# clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] -# clientfixes "lastpage" [space separated list] -# -# Timestamp requests contain: -# requesttimestamp -# -# Uploads contain: -# ocean canonical mixed case -# island canonical mixed case -# data filename=deduped.tsv.gz output of yarrg --tsv - - use strict (qw(vars)); use POSIX; use MIME::Entity; @@ -49,7 +35,7 @@ $CGI::POST_MAX= 3*1024*1024; use CGI qw/:standard -private_tempfiles/; -setlocale(LC_CTYPE, "en_GB.UTF-8"); +set_ctype_utf8(); our $now= time; defined $now or die $!; @@ -63,7 +49,7 @@ sub fail ($) { print header(-status=>'400 Bad commodity update', -type=>'text/plain', -charset=>'us-ascii'); - print "Error: $msg\n"; + print "\nError: $msg\n"; exit 0; } @@ -147,9 +133,10 @@ foreach my $mid (<_mid-*.hold>) { unlink $mid or $!==&ENOENT or die "$mid $!"; } +$o{'instance'}= $ENV{'YARRG_INSTANCE'}; my $mcontent= MIME::Entity->build(To => 'yarrg-commod-updates', - Subject => $pwd, + Subject => $ENV{'YARRG_INSTANCE'}, Type => 'multipart/mixed', Boundary => '=', 'Message-ID' => $mid, @@ -217,7 +204,7 @@ 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" + "OK\nThank you for your submission to YARRG.\n" or die $!; addlog("accepted $o{'clientspec'}");