From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 28 Jun 2009 17:44:40 +0000 (+0100)
Subject: wip upload fixes
X-Git-Tag: 1.9.2~90^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=083f9fbc63390f327f0c662732e74263edd99ce1

wip upload fixes
---

diff --git a/pctb/commod-results-processor b/pctb/commod-results-processor
index b604419..1ae88f7 100755
--- a/pctb/commod-results-processor
+++ b/pctb/commod-results-processor
@@ -402,6 +402,8 @@ sub main__upload () {
     die $resp->status_line unless $resp->is_success;
 
     print "[[ ",$resp->content," ]]\n";
+
+    system 'printenv|sort';
 }
 
 
diff --git a/pctb/convert.c b/pctb/convert.c
index 3bc7554..2a8be9b 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -231,7 +231,7 @@ int main(int argc, char **argv) {
 	o_outmode_kind= omk_none;
 	o_flags |= ff_singlepage;
       } else {
-	o_outmode_kind= omk_str;
+	o_outmode_kind= omk_upload;
       }
     }
 
diff --git a/pctb/structure.c b/pctb/structure.c
index de7d3ce..1ed0710 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -553,6 +553,8 @@ Rect find_sunshine_widget(void) {
 }
 
 void find_islandname(RgbImage *ri) {
+  find_structure(page_images[0], 0);
+
   Rect sunshiner= find_sunshine_widget();
   char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];