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=639c8b19d91449ea2b14708ddb89368e0ec1ceab;hp=58f8f28ae7d8d147a03c0d6fc4e9c3e93d99c492;hb=4c157b676894d03718be0395900162acea4f1ff3;hpb=7031695ce7767c196f2ef0f279bf4e3c7931c211

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index 58f8f28..639c8b1 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,7 +78,7 @@ 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">
@@ -139,16 +142,46 @@ while ($row=$sth->fetchrow_arrayref) {
 		sprintf('<option value="%s">%s</option>',
 			map { encode_entities($_) } @$row);
 }
+
+$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">
+function setarch(dd) {
+ alert('setarch '+dd);
+}
+function setisland(dd) {
+ alert('setisland '+dd);
+}
+</script>
+
 <table>
+
 <tr>
 %	for my $dd (0..$a{Dropdowns}-1) {
-<td><select name="islandid<% $dd %>">
+<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 %>" onchange="setisland(<% $dd %>)">
 <option name="none">Select island...</option>
 <% $islandlistdata %></select></td>
 %	}
 </tr>
+
 </table>
 % }