X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fpirate-route;h=84b61e40acc00b29865ed85466d4bd180cf60c2f;hp=639c8b19d91449ea2b14708ddb89368e0ec1ceab;hb=6fed4d2eccc640ca025f66c63cb7ac4d4423e6fb;hpb=4c157b676894d03718be0395900162acea4f1ff3

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index 639c8b1..84b61e4 100644
--- a/yarrg/web/pirate-route
+++ b/yarrg/web/pirate-route
@@ -4,6 +4,11 @@
 my %a;
 my @vars;
 
+#---------- "mode" argument parsing and mode menu at top of page ----------
+
+# for debugging, invoke as
+#  http://www.chiark.greenend.org.uk/ucgi/~clareb/mason/pirates/pirate-route?debug=1
+
 @vars= ({	Name => 'Ocean',
 		Before => 'Ocean: ',
 		CmpCanon => sub { ucfirst lc $_[0] },
@@ -56,6 +61,7 @@ foreach my $var (@vars) {
 				}
 			}
 			my $uri= URI->new($m->current_comp()->name());
+			$qf{'debug'}=1 if $debug;
 			$uri->query_form(%qf);
 			print '<a href="', $uri->path_query(), '">';
 			$after= '</a>';
@@ -63,9 +69,11 @@ foreach my $var (@vars) {
 		print $html, $after;
 		$cvalix++;
 	}
-	print '<p>';
+	print "<p>\n\n";
 }
 
+#---------- initial checks, startup, main entry form ----------
+
 die "unknown ocean $a{Ocean} ?"
 	unless grep { $_ eq $a{Ocean} } ocean_list();
 
@@ -73,121 +81,158 @@ db_setocean($a{Ocean});
 db_connect();
 
 </%perl>
+<%args>
+$debug => 0
+</%args>
 
 <h1>Specify route</h1>
 <form action="/ucgi/~clareb/mason/something" method="get">
 
+%#---------- textbox, user enters route as string ----------
 % if (!$a{Dropdowns}) {
+
 Enter route (islands, or archipelagoes, separated by |s or commas;
  abbreviations are OK):<br/>
 
 <script type="text/javascript">
-textRoute_uri= "routetextstring?format=json"
+tr_uri= "routetextstring?format=json&type=text/xml"
 		+ "&ocean=<% uri_escape($a{Ocean}) %>";
 
-textRoute_timeout=false;
-textRoute_request=false;
-textRoute_done='';
-textRoute_needed='';
-function textRoute_Later(){
-  window.clearTimeout(textRoute_timeout);
-  textRoute_timeout = window.setTimeout(textRoute_Needed, 500);
+tr_timeout=false;
+tr_request=false;
+tr_done='';
+tr_needed='';
+function tr_Later(){
+  window.clearTimeout(tr_timeout);
+  tr_timeout = window.setTimeout(tr_Needed, 500);
 }
-function textRoute_Needed(){
-  window.clearTimeout(textRoute_timeout);
-  //textRoute_element= document.getElementsByName('routestring').item(0);
-  //alert(textRoute_element.name);
-  textRoute_needed= textRoute_element.value;
-  textRoute_Request();
+function tr_Needed(){
+  window.clearTimeout(tr_timeout);
+  tr_element= document.getElementById('routestring');
+  tr_needed= tr_element.value;
+  tr_Request();
 }
-function textRoute_Request(){
-  if (textRoute_request || textRoute_needed==textRoute_done) return;
-  textRoute_done= textRoute_needed;
-  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 tr_Request(){
+  if (tr_request || tr_needed==tr_done) return;
+  tr_done= tr_needed;
+  tr_request= new XMLHttpRequest();
+  uri= tr_uri+'&string='+encodeURIComponent(tr_needed);
+  tr_request.open('GET', uri);
+  tr_request.onreadystatechange= tr_Ready;
+  tr_request.send(null);
 }
-function textRoute_Ready() {
-  if (textRoute_request.readyState != 4) return;
-  if (textRoute_request.status == 200) {
-    response= textRoute_request.responseText;
-    //alert('got [[ '+response+' ]]');
+function tr_Ready() {
+  if (tr_request.readyState != 4) return;
+  if (tr_request.status == 200) {
+    response= tr_request.responseText;
     eval('results='+response);
-    toedit= document.getElementsByName('routeresults').item(0);
-    toedit.innerHTML= results['show'];
+    toedit= document.getElementById('routeresults');
+    toedit.innerHTML= results.show;
   }
-  textRoute_request= false;
-  textRoute_Request();
+  tr_request= false;
+  tr_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="routeresults">&nbsp;</div><br/>
+<input type="text" id="routestring" name="routestring" size=80
+ onchange="tr_Needed();"
+ onkeyup="tr_Later();"><br>
+<div id="routeresults">&nbsp;</div><br/>
 
-% } else {
+% } else { #---------- dropdowns, user selects from menus ----------
 
 <%perl>
-my $sth=$dbh->prepare("SELECT islandid,islandname
-                              FROM islands
-			      ORDER BY islandname;");
+my ($sth,$row);;
+my $archlistdata='';
+my %islandlistdata;
+$islandlistdata{'none'}= <<END;
+<option value="none">Select island...</option>
+END
+
+$sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
+			    ORDER BY archipelago;");
 $sth->execute();
-my $row;
-my $islandlistdata='';
+
 while ($row=$sth->fetchrow_arrayref) {
-	$islandlistdata.=
+	my ($arch)= @$row;
+	$archlistdata.=
 		sprintf('<option value="%s">%s</option>',
-			map { encode_entities($_) } @$row);
+			map { encode_entities($_) } ($arch,$arch));
+	$islandlistdata{$arch}= <<END;
+<option value="none">Whole arch</option>
+END
 }
 
-$sth=$dbh->prepare("SELECT DISTINCT archipelago FROM islands
-			   ORDER BY archipelago;");
+$sth= $dbh->prepare("SELECT islandid,islandname,archipelago
+                            FROM islands
+			    ORDER BY islandname;");
 $sth->execute();
-my $archlistdata='';
 
 while ($row=$sth->fetchrow_arrayref) {
-	$archlistdata.=
-		sprintf('<option value="%s">%s</option>',
-			map { encode_entities($_) } (@$row, @$row));
+	my $arch= $row->[2];
+	my $here= sprintf('<option value="%s">%s</option>',
+			map { encode_entities($_) } @$row[0..1]);
+	$islandlistdata{'none'} .= $here;
+	$islandlistdata{$arch} .= $here;
 }
+
 </%perl>
 
 <script type="text/javascript">
-function setarch(dd) {
- alert('setarch '+dd);
-}
-function setisland(dd) {
- alert('setisland '+dd);
+ms_lists= <% to_json(\%islandlistdata) %>;
+function ms_Setarch(dd) {
+  debug('ms_SetArch '+dd+' arch='+arch);
+  var arch= document.getElementsByName('archipelago'+dd).item(0).value;
+  var got= ms_lists[arch];
+  if (got == undefined) return; // unknown arch ?  hrm
+  debug('ms_SetArch '+dd+' arch='+arch+' got ok');
+  var select= document.getElementsByName('islandid'+dd).item(0);
+  select.innerHTML= got;
+  debug('ms_SetArch '+dd+' arch='+arch+' innerHTML set');
 }
 </script>
 
-<table>
+<table style="table-layout:fixed; width:90%;">
 
 <tr>
 %	for my $dd (0..$a{Dropdowns}-1) {
-<td><select name="archipelago<% $dd %>" onchange="setarch(<% $dd %>)">
-<option name="none">Whole ocean</option>
+<td>
+<select  name="archipelago<% $dd %>" onchange="ms_Setarch(<% $dd %>)">
+<option value="none">Whole ocean</option>
 <% $archlistdata %></select></td>
 %	}
 </tr>
 
 <tr>
 %	for my $dd (0..$a{Dropdowns}-1) {
-<td><select name="islandid<% $dd %>" onchange="setisland(<% $dd %>)">
-<option name="none">Select island...</option>
-<% $islandlistdata %></select></td>
+<td><select name="islandid<% $dd %>">
+<% $islandlistdata{'none'} %></select></td>
 %	}
 </tr>
 
 </table>
-% }
+
+% } #---------- end of dropdowns, now common code ----------
 
 <input type=submit name=submit value="Go">
 </form>
 
+% if ($debug) {
+<p>
+<pre id="debug_log">
+Debug log:
+</pre>
+% }
+
+<script type="text/javascript">
+function debug (m) {
+% if ($debug) {
+  var node= document.getElementById('debug_log');
+  node.innerHTML += "\n" + m + "\n";
+% }
+}
+</script>
+
 <%init>
 use CommodsWeb;
 use HTML::Entities;