X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fyppedia-chart-parser;h=dacf5c354725fd017a8f930c4991693463329f6c;hp=84386b207e1b394dc5032ea56933b3c9d25d3bab;hb=95738a6be32bb3ffb3f0d9d2b803d567968ab14b;hpb=93e9c9158b5075a6466c07cc516fe85207e3e069

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 84386b2..dacf5c3 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -126,9 +126,13 @@ sub yppedia_chart_parse () {
     
 	if (($x,$y,$arch) =
 	    m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
-		    \'\[\[ [^][\']* \| (\S+)\ archipelago \]\]\'*\}\}$/xi) {
+	            (?: \<big\>)? \'+
+	            \[\[ [^][\']* \| ([^][\'|]+)\ archipelago \]\]
+	            \'+ (?: \<\/big\>)? \}\}$/xi) {
 	    printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
 	    push @wiarchlabels, [ $x,$y,$arch ];
+	} elsif (m/^\{\{ chart\ label \|\d+\|\d+\|
+		 \<big\> \'+ \[\[ .* \b ocean \]\]/xi) {
 	} elsif (($x,$y,$island) =
 	    m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\|
 		    ([^| ][^|]*[^| ]) \| .*\}\}$/xi) {