X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fcommod-results-processor;h=d427f74b41d10a51bcc2ed8fee3ae525a78e2fc2;hb=938e38497928d3f0f4e32c0dcada210dffcac607;hp=8ede37166a7c1215731769ccab8993437259634d;hpb=c98eb3b0720f8194a116aea338fd2d3caa8c7538;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index 8ede371..d427f74 100755
--- a/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@ -550,19 +550,17 @@ 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;
 
     die "@filenames ?" if grep { $_ ne $filename } @filenames;
     die "@forcerls ?" if grep { $_ ne $forcerl } @forcerls;
 
-    my $setisland= {
-    };
-
     print STDERR "Setting ocean and island...\n";
 
     my $siurl= ($url . "?action=setisland".