s/\<--.*--\>//g;
s/^\s*//; chomp; s/\s+$//; s/\s+/ /g;
s/\<\/?(?:b|em)\>//g;
- s/\{\{Chart\ style\|[^{}]*\}\}//g;
+ s/\{\{chart\ style\|[^{}]*\}\}//gi;
next unless m/\{\{/; # only interested in chart template stuff
my ($x,$y, $arch,$island,$solid,$dirn);
if (($x,$y,$arch) =
m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
- (?: \<big\>)? \'+
- \[\[ [^][\']* \| ([^][\'|]+)\ archipelago \]\]
- \'+ (?: \<\/big\>)? \}\}$/xi) {
+ (?: \<(?: big|center )\>)* \'+
+ (?: \[\[ | \{\{ )
+ [^][\']* \| ([^][\'|]+)\ archipelago
+ (?: \]\] | \}\} )
+ \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) {
printf DEBUG "%2d,%-2d arch %s\n", $x,$y,$arch;
push @wiarchlabels, [ $x,$y,$arch ];
} elsif (m/^\{\{ chart\ label \|\d+\|\d+\|
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;