From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 23 Jan 2012 02:32:16 +0000 (+0000)
Subject: Merge branch 'master' of ../ypp-sc-tools.pctb-dict
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=37ff83644f8aa00c081cb01cdaa38b9805298470;hp=e0ceea9c5d3db8ff5f0c9fb6d5dbe975f0c1f057;p=ypp-sc-tools.git

Merge branch 'master' of ../ypp-sc-tools.pctb-dict
---

diff --git a/yarrg/source-info.txt b/yarrg/source-info.txt
index b7ef35a..fdd5125 100644
--- a/yarrg/source-info.txt
+++ b/yarrg/source-info.txt
@@ -216,6 +216,10 @@ ocean Cobalt
  Garnet
   Jubilee Island
 
+ocean Cerulean
+ Garnet
+  Jubilee Island
+
 ocean Ice
  Vilya
   Winking Wall Island
@@ -227,6 +231,13 @@ ocean Hunter
   Ix Chel
   Manu Island
 
+ocean Emerald
+ Crab
+  The Beaufort Islands
+ Osprey
+  Scurvy Reef
+  Gauntlet Island
+
 ocean Malachite
  Draco
   Cetus Island
@@ -239,6 +250,16 @@ ocean Sage
 
 ocean Viridian
 
+ocean Meridian
+ Draco
+  Cetus Island
+  Threewood Island
+  Wyvern Island
+ Basilisk
+  Zechstein Island
+ Komodo
+  Buyan's Vortice
+
 # family oceans
 
 ocean Crimson
diff --git a/yarrg/yppedia-ocean-scraper b/yarrg/yppedia-ocean-scraper
index ba145ea..5e5e090 100755
--- a/yarrg/yppedia-ocean-scraper
+++ b/yarrg/yppedia-ocean-scraper
@@ -99,7 +99,7 @@ def fetch():
 	soup = BeautifulSoup(dataf)
 
 title_arch_re = regexp.compile('(\\S.*\\S) Archipelago \\((\\S+)\\)$')
-title_any_re = regexp.compile('(\\S.*\\S) \((\\S+)\\)$')
+title_any_re = regexp.compile('(\\S.*\\S) \((\\S+)\\)(?: \(page does not exist\))?$')
 href_img_re = regexp.compile('\\.png$')
 
 def title_arch_info(t):