X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fpirate-route;h=f58d47c20f450041eb39d2b13ee3d8784b4f1442;hp=42de303d16caf9bc960077596de6be4ba38d709c;hb=007700c6236644463a0e78724b8260f14be4bedd;hpb=2839e990a1173a3b7e9d8ba3c662405ed25ba1b2;ds=sidebyside

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index 42de303..f58d47c 100644
--- a/yarrg/web/pirate-route
+++ b/yarrg/web/pirate-route
@@ -66,7 +66,7 @@ foreach my $var (@vars) {
 	print '<p>';
 }
 
-db_setocean($a{'ocean'});
+db_setocean($a{Ocean});
 db_connect();
 
 </%perl>
@@ -76,9 +76,12 @@ db_connect();
 
 % if (!$a{Dropdowns}) {
 Enter route (islands, or archipelagoes, separated by commas;
- abbreviations are OK):<br>
+ abbreviations are OK):<br/>
 
 <script type="text/javascript">
+textRoute_uri= "routetextstring?format=json"
+		+ "&ocean=<% uri_escape($a{Ocean}) %>";
+
 textRoute_timeout=false;
 textRoute_request=false;
 textRoute_done='';
@@ -95,19 +98,32 @@ function textRoute_Needed(){
   textRoute_Request();
 }
 function textRoute_Request(){
-  if (textRoute_request || textRoute_needed==textRoute_done) {
-    alert('unneeded');
-    return;
-  }
+  if (textRoute_request || textRoute_needed==textRoute_done) return;
   textRoute_done= textRoute_needed;
-  alert(String.concat('needed! ',textRoute_done));
+  textRoute_request= new XMLHttpRequest();
+  uri= textRoute_uri+'&string='+encodeURIComponent(textRoute_needed);
+  textRoute_request.open('GET', uri);
+  textRoute_request.onreadystatechange= textRoute_Ready;
+  textRoute_request.send(null);
+}
+function textRoute_Ready() {
+  if (textRoute_request.readyState != 4) return;
+  if (textRoute_request.status == 200) {
+    response= textRoute_request.responseText;
+    //alert('got [[ '+response+' ]]');
+    eval('results='+response);
+    toedit= document.getElementsByName('routeresults').item(0);
+    toedit.innerHTML= results['show'];
+  }
+  textRoute_request= false;
+  textRoute_Request();
 }
 </script>
 
 <input type="text" name="routestring" size=80
  onchange="textRoute_element= event.currentTarget; textRoute_Needed();"
  onkeydown="textRoute_element= event.currentTarget; textRoute_Later();"><br>
-<div name="results"></div></br>
+<div name="routeresults"></div><br/>
 
 % } else {
 
@@ -132,9 +148,9 @@ while ($row=$sth->fetchrow_arrayref) {
 <option name="none">Select island...</option>
 <% $islandlistdata %></select></td>
 %	}
-% }
 </tr>
 </table>
+% }
 
 <input type=submit name=submit value="Go">
 </form>
@@ -142,5 +158,6 @@ while ($row=$sth->fetchrow_arrayref) {
 <%init>
 use CommodsWeb;
 use HTML::Entities;
+use URI::Escape;
 
 </%init>