X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=8b491d93a99aca47c41b8a77306648c10975acf1;hb=5d41f4f9fd6a3f188bba831a1a8902f7890cef8f;hp=ee726a9ced8d0a6c024c6d83bc3aaa95a7966882;hpb=e05f0567ea23491da8e48f892a3337f37139628f;p=ypp-sc-tools.web-live.git diff --git a/yarrg/web/query_route b/yarrg/web/query_route index ee726a9..8b491d9 100644 --- a/yarrg/web/query_route +++ b/yarrg/web/query_route @@ -36,7 +36,11 @@ <%args> $quri $dbh +$prselector $routestring => ''; +$capacitystring => ''; +$lossperleague => ''; +$capitalstring => ''; $someresults $emsgokorprint %args> @@ -46,33 +50,100 @@ my $emsg; my @archipelagoes; my @islandids; my %islandid2; +my ($max_volume, $max_mass); +my $lossperleaguepct; +my $capital; my $qa= \%ARGS; + +my $be_post; +my $startform= sub { + ($be_post)= @_; %perl> +
<%perl> #========== results ========== @@ -203,11 +275,16 @@ for my $dd (0..$qa->{Dropdowns}-1) { %perl> % if (@islandids) { -% $someresults->(); +% $someresults->('Relevant trades'); <& routetrade, dbh => $dbh, islandids => \@islandids, archipelagoes => \@archipelagoes, - qa => $qa + qa => $qa, + max_mass => $max_mass, + max_volume => $max_volume, + lossperleaguepct => $lossperleaguepct, + max_capital => $capital &> % } +