X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=fb32bcdd705017d6ad82f7da4a3344c55b44b47e;hp=759c9c547cbd92f01f39a6e9bda8e900a651d6d5;hb=c9225ff45ee5e69855cb24cfb648d903dbba54a7;hpb=9493637c44b0e22b2b9f72cf9e2748585064be56

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 759c9c5..fb32bcd 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -39,16 +39,17 @@ $dbh
 $prselector
 $routestring => '';
 $capacitystring => '';
+$lossperleague => '';
+$capitalstring => '';
 $someresults
 $emsgokorprint
 </%args>
 
 <%perl>
 my $emsg;
+my @warningfs;
 my @archipelagoes;
 my @islandids;
-my %islandid2;
-my ($max_volume, $max_mass);
 
 my $qa= \%ARGS;
 
@@ -65,135 +66,37 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
 
 <h1>Specify route</h1>
 
-% $prselector->('ShowStalls');
-
-%#---------- textbox, user enters route as string ----------
+% # 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}) {
-
-Enter route (islands, or archipelagoes, separated by |s or commas;
- abbreviations are OK):<br>
-
-% $startform->($routestring =~ m/\S/);
-
-<&| qtextstring, qa => $qa, dbh => $dbh,
-    thingstring => 'routestring', emsgstore => \$emsg,
-    perresult => sub {
-	my ($canonname, $island, $arch) = @_;
-	push @islandids, $island;
-	push @archipelagoes, defined $island ? undef : $arch;
-    }
- &>
- size=80
-</&>
-
-Vessel capacity:
-<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
-    thingstring => 'capacitystring', emsgstore => \$emsg,
-    perresult => sub {
-        ($max_volume,$max_mass) = @_;
-    }
- &>
-</&>
-
-% } else { #---------- dropdowns, user selects from menus ----------
-
-% $startform->(grep {
-%		defined $ARGS{"archipelago$_"} ||
-%		defined $ARGS{"islandid$_"}
+%     $startform->($routestring =~ m/\S/);
+% } else {
+%     $startform->(grep {
+%		defined $qa->{"archipelago$_"} ||
+%		defined $qa->{"islandid$_"}
 %	} (0..$qa->{Dropdowns}-1));
+% }
 
-<%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;
-};
-
-$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" ] ];
-}
-
-$sth= $dbh->prepare("SELECT islandid,islandname,archipelago
-                            FROM islands
-			    ORDER BY islandname;");
-$sth->execute();
+% $prselector->('ShowStalls');
 
-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 };
-}
+<& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
+	warningfs_r => \@warningfs,
+	enterwhat => 'Enter route',
+	islandids_r => \@islandids,
+	archipelagoes_r => \@archipelagoes
+ &>
 
-my %resetislandlistdata;
-foreach my $arch (keys %islandlistdata) {
-	$resetislandlistdata{$arch}=
-		$optionlistmap->($islandlistdata{$arch}, '');
-}
+%#---------- textboxes, user enters details as strings ----------
+% my $routeparams= { EmsgRef => \$emsg };
+% if (!$qa->{Dropdowns}) {
 
-</%perl>
-
-<&| 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="<% $goupdate->() %>">
 % my $ours= sub { $_[0] =~
-%	m/^island|^archipelago|^routestring|^capacitystring|^[RT]/;
+%  m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^[RT]/;
 % };
 <& "lookup:formhidden", ours => $ours &>
 
@@ -202,45 +105,21 @@ function ms_Setarch(dd) {
 
 $emsgokorprint->($emsg) or @islandids=();
 
-my $argorundef= sub {
-	my ($dd,$base) = @_;
-	my $thing= $ARGS{"${base}${dd}"};
-	$thing= undef if defined $thing and $thing eq 'none';
-	return $thing;
-};
-
-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) {
-			$someresults->();
-</%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->();
 }
 
 </%perl>
 
 % if (@islandids) {
-%	$someresults->('Relevant trades');
+%	$someresults->();
 <& routetrade,
    dbh => $dbh,
    islandids => \@islandids,
    archipelagoes => \@archipelagoes,
    qa => $qa,
-   max_mass => $max_mass,
-   max_volume => $max_volume
+   routeparams => $routeparams
  &>
-</form>
 % }
+</form>