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%2Fquery_route;h=fb32bcdd705017d6ad82f7da4a3344c55b44b47e;hp=ea94d61c8f20ddf3428f2d873232c4e2f1d27557;hb=4a64ff96caa3eddb15ed84e09b6b5c8b7d614fc8;hpb=c5b3ac45babf8012719dfb7eafd0cfa9d9eddff0

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index ea94d61..fb32bcd 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -35,193 +35,91 @@
 </%doc>
 <%args>
 $quri
-$qa
+$dbh
+$prselector
 $routestring => '';
+$capacitystring => '';
+$lossperleague => '';
+$capitalstring => '';
+$someresults
+$emsgokorprint
 </%args>
-<%perl>
 
+<%perl>
+my $emsg;
+my @warningfs;
 my @archipelagoes;
 my @islandids;
-my %islandid2;
-
-</%perl>
-
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
-
-<h1>Specify route</h1>
 
-<form action="<% $quri->() |h %>" method="get">
-
-<&| qtextstring, qa => $qa, thingstring => 'routestring' &>
- size=80
-</&>
-
-% } else { #---------- dropdowns, user selects from menus ----------
+my $qa= \%ARGS;
 
+my $be_post;
+my $startform= sub {
+	($be_post)= @_;
+</%perl>
+<form action="<% $quri->() |h %>" method="<% $be_post ? 'post' : 'get' %>">
 <%perl>
-my ($sth,$row);;
-my @archlistdata;
-my %islandlistdata;
-$islandlistdata{'none'}= [ [ "none", "Select island..." ] ];
-
-my $optionlistmap= sub {
-	my ($optlist, $selected) = @_;
-	my $out='';
-	foreach my $entry (@$optlist) {
-		$out.= sprintf('<option value="%s" %s>%s</option>',
-			encode_entities($entry->[0]),
-			defined $selected && $entry->[0] eq $selected
-				? 'selected' : '',
-			encode_entities($entry->[1]));
-	}
-	return $out;
 };
+my $goupdate= sub { $be_post ? 'Update' : 'Go' };
 
-my $dbh= dbw_connect($qa->{Ocean});
-
-$sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
-			    ORDER BY archipelago;");
-$sth->execute();
-
-while ($row=$sth->fetchrow_arrayref) {
-	my ($arch)= @$row;
-	push @archlistdata, [ $arch, $arch ];
-	$islandlistdata{$arch}= [ [ "none", "Whole arch" ] ];
-}
+</%perl>
 
-$sth= $dbh->prepare("SELECT islandid,islandname,archipelago
-                            FROM islands
-			    ORDER BY islandname;");
-$sth->execute();
+<h1>Specify route</h1>
 
-while ($row=$sth->fetchrow_arrayref) {
-	my $arch= $row->[2];
-	push @{ $islandlistdata{'none'} }, [ @$row ];
-	push @{ $islandlistdata{$arch} }, [ @$row ];
-	$islandid2{$row->[0]}= { Name => $row->[1], Arch => $arch };
-}
+% # Sadly we need to do this rather hacky thing to make it be a POST
+% #  form if the user has already selected some thing(s)
+% if (!$qa->{Dropdowns}) {
+%     $startform->($routestring =~ m/\S/);
+% } else {
+%     $startform->(grep {
+%		defined $qa->{"archipelago$_"} ||
+%		defined $qa->{"islandid$_"}
+%	} (0..$qa->{Dropdowns}-1));
+% }
 
-my %resetislandlistdata;
-foreach my $arch (keys %islandlistdata) {
-	$resetislandlistdata{$arch}=
-		$optionlistmap->($islandlistdata{$arch}, '');
-}
+% $prselector->('ShowStalls');
 
-$dbh->rollback();
+<& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
+	warningfs_r => \@warningfs,
+	enterwhat => 'Enter route',
+	islandids_r => \@islandids,
+	archipelagoes_r => \@archipelagoes
+ &>
 
-</%perl>
+%#---------- textboxes, user enters details as strings ----------
+% my $routeparams= { EmsgRef => \$emsg };
+% if (!$qa->{Dropdowns}) {
 
-<input type=hidden name=dropdowns value="<% $qa->{Dropdowns} |h %>">
-
-<&| script &>
-ms_lists= <% to_json_protecttags(\%resetislandlistdata) %>;
-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 style="table-layout:fixed; width:90%;">
-
-<tr>
-%	for my $dd (0..$qa->{Dropdowns}-1) {
-<td>
-<select name="archipelago<% $dd %>" onchange="ms_Setarch(<% $dd %>)">
-<option value="none">Whole ocean</option>
-<% $optionlistmap->(\@archlistdata, $ARGS{"archipelago$dd"}) %></select></td>
-%	}
-</tr>
-
-<tr>
-%	for my $dd (0..$qa->{Dropdowns}-1) {
-%		my $arch= $ARGS{"archipelago$dd"};
-%		$arch= 'none' if !defined $arch;
-<td>
-<select name="islandid<% $dd %>">
-<% $optionlistmap->($islandlistdata{$arch}, $ARGS{"islandid$dd"}) %>
-</select></td>
-%	}
-</tr>
-
-</table>
+<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
 
 % } #---------- end of dropdowns, now common middle of page code ----------
 
-<input type=submit name=submit value="Go">
-</form>
+<input type=submit name=submit value="<% $goupdate->() %>">
+% my $ours= sub { $_[0] =~
+%  m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^[RT]/;
+% };
+<& "lookup:formhidden", ours => $ours &>
 
 <%perl>
-#========== result computations ==========
+#========== results ==========
 
-my $results_head;
-$results_head= sub {
-	print "<h1>Results</h1>\n";
-	$results_head= sub { };
-};
-
-#---------- result computation - textstring ----------
-if (!$qa->{Dropdowns}) {
-  if (length $routestring) {
-	$results_head->();
-	my ($emsg,$canonstring,$results)= $m->comp('check_routestring',
-		ocean => $qa->{Ocean},
-		string => $routestring,
-		format => 'return'
-	);
-	if (length $emsg) {
-		print encode_entities($emsg);
-	} else {
-		foreach my $entry (@$results) {
-			push @archipelagoes,
-				defined $entry->[1] ? undef : $entry->[0];
-			push @islandids, $entry->[1];
-		} 
-	}
-  }
-
-} else { #---------- results - dropdowns ----------
-
-my $argorundef= sub {
-	my ($dd,$base) = @_;
-	my $thing= $ARGS{"${base}${dd}"};
-	$thing= undef if defined $thing and $thing eq 'none';
-	return $thing;
-};
+$emsgokorprint->($emsg) or @islandids=();
 
-for my $dd (0..$qa->{Dropdowns}-1) {
-	my $arch= $argorundef->($dd,'archipelago');
-	my $island= $argorundef->($dd,'islandid');
-	next unless defined $arch or defined $island;
-	if (defined $island and defined $arch) {
-		my $ii= $islandid2{$island};
-		my $iarch= $ii->{Arch};
-		if ($iarch ne $arch) {
-			$results_head->();
-</%perl>
- Specified archipelago <% $arch %> but
- island <% $ii->{Name} %>
- which is in <% $iarch %>; using the island.<br>
-<%perl>
-		}
-		$arch= undef;
-	}
-	push @archipelagoes, $arch;
-	push @islandids, $island;
+foreach my $warningf (@warningfs) {
+	$someresults->();
+	$warningf->();
 }
 
-}#---------- result processing, common stuff
 </%perl>
 
 % if (@islandids) {
-%	$results_head->();
-
-<& routetrade, islandids => \@islandids, archipelagoes => \@archipelagoes &>
-
+%	$someresults->();
+<& routetrade,
+   dbh => $dbh,
+   islandids => \@islandids,
+   archipelagoes => \@archipelagoes,
+   qa => $qa,
+   routeparams => $routeparams
+ &>
 % }
+</form>