X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fyppedia-chart-parser;fp=yarrg%2Fyppedia-chart-parser;h=11c7484ad9db1abba4c60947c1c6e4bff48403ba;hb=66482684911b5a12a5182797de54a24c2b31c29a;hp=84386b207e1b394dc5032ea56933b3c9d25d3bab;hpb=6a03862e8e23287617045432cc14fb15305c2261;p=ypp-sc-tools.db-test.git diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser index 84386b2..11c7484 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) { + (?: \)? \'+ + \[\[ [^][\']* \| (\S+)\ archipelago \]\] + \'+ (?: \<\/big\>)? \}\}$/xi) { printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch; push @wiarchlabels, [ $x,$y,$arch ]; + } elsif (m/^\{\{ chart\ label \|\d+\|\d+\| + \ \'+ \[\[ .* \b ocean \]\]/xi) { } elsif (($x,$y,$island) = m/^\{\{ chart\ island\ icon \|(\d+)\|(\d+)\| ([^| ][^|]*[^| ]) \| .*\}\}$/xi) {