Merge branch 'master' of chiark.greenend.org.uk:things/Yarrgweb/ypp-sc-tools.test

diff --git a/yarrg/CommodsScrape.pm b/yarrg/CommodsScrape.pm
index ccc2d98bd0ea4624fb7d977e5411b8459a414686..2cd1148f9a3f1c60a97e22cf3b0d1f60d5a84e47 100644 (file)
--- 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/source-info.txt b/yarrg/source-info.txt
index eb3e7d2c26926f1747f62dee2f9d0a62f149323f..331a7ed35081357698ffc6cad4e2f5b34c428dd5 100644 (file)
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -259,3 +259,8 @@ ocean Ice
   Winking Wall Island
 
 ocean Obsidian
+ Ye Bloody Bounding Main
+  Loggerhead Island
+  Melanaster Island
+  Picklepine Ridge
+  Woodtick Island