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%2Fquery_route;h=9a6ca0829114c622552209991c1fb6e1901094f4;hp=66dee1dd08135de011871b15d71d963f7db235af;hb=4c6a28f4cbed2ed351697f63f30fb4827259f6a9;hpb=72587d0d7358ca77ecd0ede859abba7f89b1d9d2

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 66dee1d..9a6ca08 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -35,7 +35,11 @@
 </%doc>
 <%args>
 $quri
+$dbh
+$prselector
 $routestring => '';
+$capacitystring => '';
+$lossperleague => '';
 $someresults
 $emsgokorprint
 </%args>
@@ -45,21 +49,36 @@ my $emsg;
 my @archipelagoes;
 my @islandids;
 my %islandid2;
+my ($max_volume, $max_mass);
+my $lossperleaguepct;
 
 my $qa= \%ARGS;
+
+my $be_post;
+my $startform= sub {
+	($be_post)= @_;
 </%perl>
+<form action="<% $quri->() |h %>" method="<% $be_post ? 'post' : 'get' %>">
+<%perl>
+};
+my $goupdate= sub { $be_post ? 'Update' : 'Go' };
 
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
+</%perl>
 
 <h1>Specify route</h1>
 
+% $prselector->('ShowStalls');
+
+%#---------- textbox, user enters route as string ----------
+% if (!$qa->{Dropdowns}) {
+
 Enter route (islands, or archipelagoes, separated by |s or commas;
  abbreviations are OK):<br>
 
-<form action="<% $quri->() |h %>" method="get">
+% $startform->($routestring =~ m/\S/);
 
-<&| qtextstring, qa => $qa, thingstring => 'routestring', emsgstore => \$emsg,
+<&| qtextstring, qa => $qa, dbh => $dbh,
+    thingstring => 'routestring', emsgstore => \$emsg,
     perresult => sub {
 	my ($canonname, $island, $arch) = @_;
 	push @islandids, $island;
@@ -69,8 +88,47 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
  size=80
 </&>
 
+<strong>Advanced options - you may leave these blank:</strong>
+<p>
+<table>
+<tr>
+<td>
+
+Vessel or capacity:
+<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
+    thingstring => 'capacitystring', emsgstore => \$emsg,
+    helpref => 'capacity',
+    perresult => sub {
+        ($max_mass,$max_volume) = @_;
+    }
+ &>
+ size=40
+</&>
+
+<td>
+&nbsp;
+&nbsp;
+
+<td>
+Expected losses:
+
+<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
+    thingstring => 'lossperleague', emsgstore => \$emsg,
+    helpref => 'losses',
+    perresult => sub { ($lossperleaguepct)= @_; }
+ &>
+ size=9
+</&>
+
+</table>
+
 % } else { #---------- dropdowns, user selects from menus ----------
 
+% $startform->(grep {
+%		defined $ARGS{"archipelago$_"} ||
+%		defined $ARGS{"islandid$_"}
+%	} (0..$qa->{Dropdowns}-1));
+
 <%perl>
 my ($sth,$row);
 my @archlistdata;
@@ -90,8 +148,6 @@ my $optionlistmap= sub {
 	return $out;
 };
 
-my $dbh= dbw_connect($qa->{Ocean});
-
 $sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
 			    ORDER BY archipelago;");
 $sth->execute();
@@ -120,8 +176,6 @@ foreach my $arch (keys %islandlistdata) {
 		$optionlistmap->($islandlistdata{$arch}, '');
 }
 
-$dbh->rollback();
-
 </%perl>
 
 <&| script &>
@@ -164,10 +218,11 @@ function ms_Setarch(dd) {
 
 % } #---------- end of dropdowns, now common middle of page code ----------
 
-<input type=submit name=submit value="Go">
-% my $ours= sub { $_[0] =~ m/^island|^archipelago|^routestring/; };
+<input type=submit name=submit value="<% $goupdate->() %>">
+% my $ours= sub { $_[0] =~
+%  m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^[RT]/;
+% };
 <& "lookup:formhidden", ours => $ours &>
-</form>
 
 <%perl>
 #========== results ==========
@@ -205,6 +260,15 @@ for my $dd (0..$qa->{Dropdowns}-1) {
 </%perl>
 
 % if (@islandids) {
-%	$someresults->();
-<& routetrade, islandids => \@islandids, archipelagoes => \@archipelagoes &>
+%	$someresults->('Relevant trades');
+<& routetrade,
+   dbh => $dbh,
+   islandids => \@islandids,
+   archipelagoes => \@archipelagoes,
+   qa => $qa,
+   max_mass => $max_mass,
+   max_volume => $max_volume,
+   lossperleaguepct => $lossperleaguepct
+ &>
+</form>
 % }