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=393e7a668755145d05262a56b56ed005330669c1;hpb=59bee7afb77216585b904bd20f17e71005e9778c;p=ypp-sc-tools.web-live.git diff --git a/yarrg/web/query_route b/yarrg/web/query_route index 393e7a6..8b491d9 100644 --- a/yarrg/web/query_route +++ b/yarrg/web/query_route @@ -38,6 +38,9 @@ $quri $dbh $prselector $routestring => ''; +$capacitystring => ''; +$lossperleague => ''; +$capitalstring => ''; $someresults $emsgokorprint %args> @@ -47,6 +50,9 @@ my $emsg; my @archipelagoes; my @islandids; my %islandid2; +my ($max_volume, $max_mass); +my $lossperleaguepct; +my $capital; my $qa= \%ARGS; @@ -75,15 +81,62 @@ Enter route (islands, or archipelagoes, separated by |s or commas; <&| qtextstring, qa => $qa, dbh => $dbh, thingstring => 'routestring', emsgstore => \$emsg, - perresult => sub { - my ($canonname, $island, $arch) = @_; - push @islandids, $island; - push @archipelagoes, defined $island ? undef : $arch; + onresults => sub { + foreach (@_) { + my ($canonname, $island, $arch) = @$_; + push @islandids, $island; + push @archipelagoes, defined $island ? undef : $arch; + } } &> size=80 &> +Advanced options - you may leave these blank: +
+
+ +Vessel or capacity: +<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs', + thingstring => 'capacitystring', emsgstore => \$emsg, + helpref => 'capacity', + onresults => sub { ($max_mass,$max_volume) = @_; } + &> + size=40 +&> + + | + + + + | +Expected losses: + +<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll', + thingstring => 'lossperleague', emsgstore => \$emsg, + helpref => 'losses', + onresults => sub { ($lossperleaguepct)= @_; } + &> + size=9 +&> + |
Available capital: + +<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac', + thingstring => 'capitalstring', emsgstore => \$emsg, + helpref => 'capital', + onresults => sub { ($capital)= @_; } + &> + size=9 +&> + | +