Cope with multi-word arches

[ypp-sc-tools.db-test.git] / yarrg / yppedia-chart-parser

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 84386b207e1b394dc5032ea56933b3c9d25d3bab..dacf5c354725fd017a8f930c4991693463329f6c 100755 (executable)
--- 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) {