Merge branch 'master' into ourdb

Conflicts:

	pctb/commod-results-processor

diff --cc pctb/commod-results-processor
index 4beb6d066a59af51b46591b70d7158941f26a9e4,fe26f8847348aea3dbaf7e076f05b2ef52269744..cba01d9ac732a3713a3f658bf1910a456330f4dd
--- 1/pctb/commod-results-processor
--- 2/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@@ -424,17 -435,25 +424,35 @@@ sub save_upload_html ($$) 
      close R or die $!;
  }
  
- sub main__upload_yaarg () {
+ sub gzip ($) {
+     my ($raw) = @_;
+     my $tf= IO::File::new_tmpfile() or die $!;
+     print $tf $raw or die $!;
+     $tf->flush or die $!;
+     $tf->seek(0,0) or die $!;
+     my $child= open GZ, "-|"; defined $child or die $!;
+     if (!$child) {
+       open STDIN, "<&", $tf;
+       exec 'gzip'; die $!;
+     }
+     my $r;
+     { undef $/; $!=0; $r= <GZ>; }
+     defined $r or die $!;
+     close GZ or die "$! $?";  die $? if $?;
+     return $r;
+ }
+ 
 -sub main__upload () {
++sub main__uploadyaarg () {
 +    my $ocean= $ENV{'YPPSC_OCEAN'};  die unless $ocean;
 +    my $island= $ENV{'YPPSC_ISLAND'};  die unless $island;
 +    my $content= {
 +      'data' => [ undef, 'deduped.tsv.gz',
 +                  Content_Type => 'application/octet-stream',
 +                  Content => '' 
 +]};
 +}
 +
- sub main__upload_pctb () {
++sub main__uploadpctb () {
      my $ocean= $ENV{'YPPSC_OCEAN'};  die unless $ocean;
      my $island= $ENV{'YPPSC_ISLAND'};  die unless $island;
      die unless $pctb;