From: Wayne Schlitt <agthisell@yahoo.com>
Date: Mon, 16 Oct 2017 17:08:53 +0000 (+0100)
Subject: compatibility with obsidian
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=89de43f79c1a644669c3c00ba27157081ef29fcd

compatibility with obsidian
---

diff --git a/yarrg/CommodsScrape.pm b/yarrg/CommodsScrape.pm
index ccc2d98..2cd1148 100644
--- a/yarrg/CommodsScrape.pm
+++ b/yarrg/CommodsScrape.pm
@@ -62,7 +62,7 @@ sub yppedia_chart_parse ($$ $$$$ $) {
 	    m/^\{\{ chart\ label \|(\d+)\|(\d+)\| .*
 	            (?: \<(?: big|center )\>)* \'+
 	            (?: \[\[ | \{\{ )
-	            [^][\']* \| ([^][\'|]+)\ archipelago
+	            [^][]* \| ([^][|]+)\ archipelago
 	            (?: \]\] | \}\} )
 	            \'+ (?: \<\/(?: big|center )\>)* \}\}$/xi) {
 	    printf $debugfh "%2d,%-2d arch %s\n", $x,$y,$arch;
diff --git a/yarrg/yppedia-chart-parser b/yarrg/yppedia-chart-parser
index 52bd4f7..9cda849 100755
--- a/yarrg/yppedia-chart-parser
+++ b/yarrg/yppedia-chart-parser
@@ -369,7 +369,8 @@ sub compare_island_lists () {
 	    if (!defined $wtarch) {
 		error("island from chart not found on ocean page: $island");
 	    } elsif (defined $wiarch and $wtarch ne $wiarch) {
-		error("island in $wtarch on ocean page but".
+#		error("island in $wtarch on ocean page but".
+		warning("island in $wtarch on ocean page but".
 		      " concluded $wiarch from chart: $island");
 	    }
 	}