From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Fri, 24 Jul 2009 16:58:49 +0000 (+0100)
Subject: Merge branch 'master' into ourdb
X-Git-Tag: 3.0~44
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=769239e4cc9af0b88578d1b15a1b14a7cb3dc7ba

Merge branch 'master' into ourdb

Conflicts:

	pctb/commod-results-processor
---

769239e4cc9af0b88578d1b15a1b14a7cb3dc7ba
diff --cc pctb/commod-results-processor
index 4beb6d0,fe26f88..cba01d9
--- a/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;