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: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=769239e4cc9af0b88578d1b15a1b14a7cb3dc7ba;hp=dc85c07a4cf546e987221571a20269ea659efa91;p=ypp-sc-tools.db-test.git

Merge branch 'master' into ourdb

Conflicts:

	pctb/commod-results-processor
---

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index 4beb6d0..cba01d9 100755
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -424,7 +424,25 @@ 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__uploadyaarg () {
     my $ocean= $ENV{'YPPSC_OCEAN'};  die unless $ocean;
     my $island= $ENV{'YPPSC_ISLAND'};  die unless $island;
     my $content= {
@@ -434,7 +452,7 @@ sub main__upload_yaarg () {
 ]};
 }
 
-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;
@@ -444,7 +462,7 @@ sub main__upload_pctb () {
     my $content= {
 	'marketdata' => [ undef, "marketdata.gz",
 			  Content_Type => 'application/gzip',
-			  Content => $o
+			  Content => gzip($o),
 			  ]
 		      };