From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 11 Aug 2009 18:40:15 +0000 (+0100)
Subject: AJAX route validator improved
X-Git-Tag: 3.4~228
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=7031695ce7767c196f2ef0f279bf4e3c7931c211

AJAX route validator improved
---

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index f58d47c..58f8f28 100644
--- a/yarrg/web/pirate-route
+++ b/yarrg/web/pirate-route
@@ -123,7 +123,7 @@ function textRoute_Ready() {
 <input type="text" name="routestring" size=80
  onchange="textRoute_element= event.currentTarget; textRoute_Needed();"
  onkeydown="textRoute_element= event.currentTarget; textRoute_Later();"><br>
-<div name="routeresults"></div><br/>
+<div name="routeresults">&nbsp;</div><br/>
 
 % } else {
 
diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
index 0e4ae6e..b84fd84 100644
--- a/yarrg/web/routetextstring
+++ b/yarrg/web/routetextstring
@@ -6,6 +6,10 @@ $string
 </%args>
 <%perl>
 
+# typical url for this script:
+#  http://www.chiark.greenend.org.uk/ucgi/~clareb/mason/pirates/routetextstring?format=json&ocean=Midnight&string=d
+
+
 use CommodsWeb;
 use HTML::Entities;
 use JSON;
@@ -29,7 +33,7 @@ if ($format =~ 'json') {
 	})};
 	$output_wrong= sub { print to_json({
 		success => 0,
-		show => encode_entities($_[0]),
+		show => $_[0],
 	})};
 }		
 
@@ -47,7 +51,7 @@ foreach my $each (split m#[/|,]#, $string) {
 	if (!@$results) {
 		$err->('no island or arch matches "%s"');
 	} elsif (@$results > 3) {
-		$err->('');
+		$err->('&nbsp;');
 	} elsif (@$results > 1) {
 		my @m= map { $_->[2] } @$results;
 		$err->('ambiguous island or arch "%s", could be '.