From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Mon, 29 Mar 2010 22:22:25 +0000 (+0100)
Subject: Merge branch 'master' of /home/ian/things/ypp-sc-tools
X-Git-Tag: 6.5.1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=refs%2Ftags%2F6.5.1;hp=55b97973486c7568b36c89aa4b16e2d5b42f0614

Merge branch 'master' of /home/ian/things/ypp-sc-tools
---

diff --git a/yarrg/CommodsScrape.pm b/yarrg/CommodsScrape.pm
index 3e6f1c6..2b1d4a9 100644
--- a/yarrg/CommodsScrape.pm
+++ b/yarrg/CommodsScrape.pm
@@ -54,7 +54,7 @@ sub yppedia_chart_parse ($$ $$$$ $) {
 	s/\<--.*--\>//g;
 	s/^\s*//; chomp; s/\s+$//; s/\s+/ /g;
 	s/\<\/?(?:b|em)\>//g;
-	s/\{\{chart\ style\|[^{}]*\}\}//gi;
+	s/\{\{(?:chart\ style|Chart league difficulty)\|[^{}]*\}\}//gi;
 	next unless m/\{\{/; # only interested in chart template stuff
 
 	if (($x,$y,$arch) =
@@ -76,7 +76,7 @@ sub yppedia_chart_parse ($$ $$$$ $) {
 	    $on_island->($n, $island);
 	} elsif (($solid,$x,$y,$dirn) =
 	    m/^\{\{ chart\ league((?:\ solid)?) \|(\d+)\|(\d+)\|
-		    ([-\/\\o]) \| .*\}\}$/xi) {
+		    \.?([-\/\\o])\.? \| .*\}\}$/xi) {
 	    next if $dirn eq 'o';
 
 	    printf $debugfh "%2d,%-2d league %-6s %s\n", $x,$y,
@@ -86,7 +86,7 @@ sub yppedia_chart_parse ($$ $$$$ $) {
 	    if ($dirn eq '-') { $bx+=2; }
 	    elsif ($dirn eq '\\') { $bx++; $by++; }
 	    elsif ($dirn eq '/') { $x++; $by++; }
-	    else { die; }
+	    else { die "$dirn ?"; }
 
 	    my $na= $nn->();
 	    my $nb= $conv_nxy->($bx,$by);
diff --git a/yarrg/where-vessels b/yarrg/where-vessels
index 9b8c772..272a114 100755
--- a/yarrg/where-vessels
+++ b/yarrg/where-vessels
@@ -133,6 +133,9 @@ proc argdefaults {} {
 	if {[info exists ocean]} { lappend cmd --ocean $ocean }
 	if {[info exists pirate]} { lappend cmd --pirate $pirate }
 	manyset [split [eval exec $cmd] " "] ocean pirate
+	if {![llength $ocean] || ![llength $pirate]} {
+	    error "$ocean $pirate ?"
+	}
     }
     lappend scraper $ocean
 }