X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fpirate-route;h=c80bacffa25b280d6edd666c51d80c2c6f9ab13f;hb=f97853ce6dc9df1caedecd2dac9530d53fdb844d;hp=58f8f28ae7d8d147a03c0d6fc4e9c3e93d99c492;hpb=7031695ce7767c196f2ef0f279bf4e3c7931c211;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index 58f8f28..c80bacf 100644
--- a/yarrg/web/pirate-route
+++ b/yarrg/web/pirate-route
@@ -7,7 +7,7 @@ my @vars;
 @vars= ({	Name => 'Ocean',
 		Before => 'Ocean: ',
 		CmpCanon => sub { ucfirst lc $_[0] },
-		Values => [ qw(Midnight Ice) ]
+		Values => [ ocean_list() ]
 	}, {	Name => 'Dropdowns',
 		Before => 'Interface: ',
 		CmpCanon => sub { !!$_[0] },
@@ -55,7 +55,7 @@ foreach my $var (@vars) {
 					$qf{$n}= $value;
 				}
 			}
-			my $uri= URI->new($self_url);
+			my $uri= URI->new($m->current_comp()->name());
 			$uri->query_form(%qf);
 			print '<a href="', $uri->path_query(), '">';
 			$after= '</a>';
@@ -66,6 +66,9 @@ foreach my $var (@vars) {
 	print '<p>';
 }
 
+die "unknown ocean $a{Ocean} ?"
+	unless grep { $_ eq $a{Ocean} } ocean_list();
+
 db_setocean($a{Ocean});
 db_connect();
 
@@ -75,73 +78,117 @@ db_connect();
 <form action="/ucgi/~clareb/mason/something" method="get">
 
 % if (!$a{Dropdowns}) {
-Enter route (islands, or archipelagoes, separated by commas;
+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');
+  //alert(tr_element.name);
+  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;
+function tr_Ready() {
+  if (tr_request.readyState != 4) return;
+  if (tr_request.status == 200) {
+    response= tr_request.responseText;
     //alert('got [[ '+response+' ]]');
     eval('results='+response);
-    toedit= document.getElementsByName('routeresults').item(0);
+    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 {
 
 <%perl>
-my $sth=$dbh->prepare("SELECT islandid,islandname
+my $sth=$dbh->prepare("SELECT islandid,islandname,archipelago
                               FROM islands
 			      ORDER BY islandname;");
 $sth->execute();
 my $row;
 my $islandlistdata='';
+my %archmap=();
 while ($row=$sth->fetchrow_arrayref) {
 	$islandlistdata.=
 		sprintf('<option value="%s">%s</option>',
-			map { encode_entities($_) } @$row);
+			map { encode_entities($_) } @$row[0..1]);
+	$archmap{$row->[0]}= $row->[2];
+}
+
+$sth=$dbh->prepare("SELECT DISTINCT archipelago FROM islands
+			   ORDER BY archipelago;");
+$sth->execute();
+my $archlistdata='';
+
+while ($row=$sth->fetchrow_arrayref) {
+	$archlistdata.=
+		sprintf('<option value="%s">%s</option>',
+			map { encode_entities($_) } (@$row, @$row));
 }
 </%perl>
 
+<script type="text/javascript">
+sel_archmap= <% to_json(\%archmap) %>;
+function setarch(dd) {
+  var arch= document.getElementsByName('archipelago'+dd).item(0).value;
+  var select= document.getElementsByName('islandid'+dd).item(0);
+  var nodes= select.getElementsByTagName('option');
+  for (var i=0; i<nodes.length; i++) {
+    node= nodes.item(i);
+    value= node.getAttribute('value');
+    if (value == 'none') {
+      if (arch == 'none') {
+	node.innerHTML= 'Select island ...';
+      } else {
+	node.innerHTML= 'Whole arch';
+      }
+    } else {
+//      alert('node i='+i+' arch='+arch+' value='+value+'.');
+      node.setAttribute('disabled', !(arch=='none' || value==arch));
+    }
+  }
+}
+</script>
+
 <table>
+
+<tr>
+%	for my $dd (0..$a{Dropdowns}-1) {
+<td><select name="archipelago<% $dd %>" onchange="setarch(<% $dd %>)">
+<option name="none">Whole ocean</option>
+<% $archlistdata %></select></td>
+%	}
+</tr>
+
 <tr>
 %	for my $dd (0..$a{Dropdowns}-1) {
 <td><select name="islandid<% $dd %>">
@@ -149,6 +196,7 @@ while ($row=$sth->fetchrow_arrayref) {
 <% $islandlistdata %></select></td>
 %	}
 </tr>
+
 </table>
 % }