X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fyppedia-chart-parser;h=e6e22b5799374754bcfdd060d381110afaf95a5b;hp=b35d8165a016bfe1dbe28a9166ef5ebf008b9543;hb=b14effcf3ea7900eb4198f6e50112da751f29add;hpb=243aacd694064310880840502e5fd4dba729dd0a

diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index b35d816..e6e22b5 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -127,7 +127,9 @@ sub yppedia_chart_parse () {
 	if (($x,$y,$arch) =
 	    m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
 	            (?: \<(?: big|center )\>)* \'+
-	            \[\[ [^][\']* \| ([^][\'|]+)\ archipelago \]\]
+	            (?: \[\[ | \{\{ )
+	            [^][\']* \| ([^][\'|]+)\ archipelago
+	            (?: \]\] | \}\} )
 	            \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) {
 	    printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
 	    push @wiarchlabels, [ $x,$y,$arch ];
@@ -770,6 +772,7 @@ for (;;) {
 	    print STDERR "*** --stdin-chart, aborting!\n";
 	    exit 1;
 	}
+	progress("checking database");        db_check_referential_integrity();
 	progress("committing database");       $dbh->commit();
 	progress("committing _ocean-*.txt");   localtopo_commit();
 	exit 0;