From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 4 Sep 2010 15:10:49 +0000 (+0100)
Subject: yarrg/commod-results-processor: fix potential pctb upload bug
X-Git-Tag: 6.7.0~14^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=9e7b2a51983738ccfaac47f13142889fa6f9a7b0

yarrg/commod-results-processor: fix potential pctb upload bug
Only look at islands[] entries for correct ocean
---

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index 3482381..d427f74 100755
--- a/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@ -550,10 +550,11 @@ sub main__uploadpctb () {
 
     my $islandid;
     while ($resptxt =~
- m/^islands\[\d+\]\[\d+\]\=new\s+option\(\"(.*)\"\,(\d+)\)\s*$/mig
+ m/^islands\[(\d+)\]\[\d+\]\=new\s+option\(\"(.*)\"\,(\d+)\)\s*$/mig
 	   ) {
-	next unless $1 eq $island;
-	$islandid= $2;
+	next unless $1 eq $oceanids[0];
+	next unless $2 eq $island;
+	$islandid= $3;
     }
     defined $islandid or die;