X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fcommod-results-processor;h=d427f74b41d10a51bcc2ed8fee3ae525a78e2fc2;hb=b02009e8f9d10c15aac4ee3cb7a513912fdca050;hp=3482381224748026b3741bdf233031d61a08e8a8;hpb=7777fdd2e8201dc28ab1380206c8debf34002e5b;p=ypp-sc-tools.db-test.git 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;