X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2FCommodsScrape.pm;h=d6951cf6b905e99c792a280013cd94395b1ba521;hp=2b1d4a9add9ed0bf0d1cc49d63e55a6996348e97;hb=a2368f803f45f33f403e122428b9b493ca458986;hpb=3ece24832da57c70c4ca1c745d6dd79227447322

diff --git a/yarrg/CommodsScrape.pm b/yarrg/CommodsScrape.pm
index 2b1d4a9..d6951cf 100644
--- a/yarrg/CommodsScrape.pm
+++ b/yarrg/CommodsScrape.pm
@@ -46,7 +46,7 @@ sub yppedia_chart_parse ($$ $$$$ $) {
 	$conv_nxy, $on_archlabel, $on_island, $on_league,
 	$on_incomprehensible) = @_;
 
-    my ($x,$y, $arch,$island,$solid,$dirn);
+    my ($x,$y, $arch,$island,$sizecol,$solid,$dirn);
     my $nn= sub { return $conv_nxy->($x,$y) };
     
     # We don't even bother with tag soup; instead we do line-oriented parsing.
@@ -68,12 +68,12 @@ sub yppedia_chart_parse ($$ $$$$ $) {
 	    $on_archlabel->($x,$y,$arch);
 	} elsif (m/^\{\{ chart\ label \|\d+\|\d+\|
 		 \<big\> \'+ \[\[ .* \b ocean \]\]/xi) {
-	} elsif (($x,$y,$island) =
+	} elsif (($x,$y,$island,$sizecol) =
 	    m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\|
-		    ([^| ][^|]*[^| ]) \| .*\}\}$/xi) {
+		    ([^| ][^|]*[^| ]) \| [^|]* \| (\w+) \| .*\}\}$/xi) {
 	    my $n= $nn->();
 	    printf $debugfh "%2d,%-2d island %s\n", $x,$y,$island;
-	    $on_island->($n, $island);
+	    $on_island->($n, $island, $sizecol);
 	} elsif (($solid,$x,$y,$dirn) =
 	    m/^\{\{ chart\ league((?:\ solid)?) \|(\d+)\|(\d+)\|
 		    \.?([-\/\\o])\.? \| .*\}\}$/xi) {