chiark / gitweb /
Cope with multi-word arches
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 1 Sep 2009 15:12:52 +0000 (16:12 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 1 Sep 2009 15:12:52 +0000 (16:12 +0100)
yarrg/yppedia-chart-parser

index 11c7484ad9db1abba4c60947c1c6e4bff48403ba..dacf5c354725fd017a8f930c4991693463329f6c 100755 (executable)
@@ -127,7 +127,7 @@ sub yppedia_chart_parse () {
        if (($x,$y,$arch) =
            m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
                    (?: \<big\>)? \'+
        if (($x,$y,$arch) =
            m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
                    (?: \<big\>)? \'+
-                   \[\[ [^][\']* \| (\S+)\ archipelago \]\]
+                   \[\[ [^][\']* \| ([^][\'|]+)\ archipelago \]\]
                    \'+ (?: \<\/big\>)? \}\}$/xi) {
            printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
            push @wiarchlabels, [ $x,$y,$arch ];
                    \'+ (?: \<\/big\>)? \}\}$/xi) {
            printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
            push @wiarchlabels, [ $x,$y,$arch ];