From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 1 Sep 2009 15:12:52 +0000 (+0100)
Subject: Cope with multi-word arches
X-Git-Tag: 3.4~42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=95738a6be32bb3ffb3f0d9d2b803d567968ab14b

Cope with multi-word arches
---

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 11c7484..dacf5c3 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -127,7 +127,7 @@ sub yppedia_chart_parse () {
 	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 ];