X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=d4a3bd15e4c06cd362765852d3e63bcc8c6284fd;hb=4a6d70dd3122b15dd2446e7fc7ac2782f70f067f;hp=ee457f57abd41502ad3d54f58385b16638e8ced5;hpb=f3fdcfd6d9e7d88fbc97f9294c302c338d2500b5;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index ee457f5..d4a3bd1 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -38,6 +38,7 @@ $quri
 $dbh
 $prselector
 $routestring => '';
+$capacitystring => '';
 $someresults
 $emsgokorprint
 </%args>
@@ -47,6 +48,7 @@ my $emsg;
 my @archipelagoes;
 my @islandids;
 my %islandid2;
+my ($max_volume, $max_mass);
 
 my $qa= \%ARGS;
 
@@ -84,12 +86,21 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
  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$dd"} ||
-		defined %ARGS{"islandid$dd"}
-	} (0..$qa->{Dropdowns}-1));
+% $startform->(grep {
+%		defined $ARGS{"archipelago$_"} ||
+%		defined $ARGS{"islandid$_"}
+%	} (0..$qa->{Dropdowns}-1));
 
 <%perl>
 my ($sth,$row);
@@ -181,7 +192,9 @@ function ms_Setarch(dd) {
 % } #---------- end of dropdowns, now common middle of page code ----------
 
 <input type=submit name=submit value="<% $goupdate->() %>">
-% my $ours= sub { $_[0] =~ m/^island|^archipelago|^routestring|^[RT]/; };
+% my $ours= sub { $_[0] =~
+%	m/^island|^archipelago|^routestring|^capacitystring|^[RT]/;
+% };
 <& "lookup:formhidden", ours => $ours &>
 
 <%perl>