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=cfe03df4202d0d1db8fb6917f964b0ac229ae101;hpb=7c63864aad4c3d4391140b3361d5c1843181217e;p=ypp-sc-tools.web-live.git
diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index cfe03df..8b491d9 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -40,6 +40,7 @@ $prselector
$routestring => '';
$capacitystring => '';
$lossperleague => '';
+$capitalstring => '';
$someresults
$emsgokorprint
%args>
@@ -51,6 +52,7 @@ my @islandids;
my %islandid2;
my ($max_volume, $max_mass);
my $lossperleaguepct;
+my $capital;
my $qa= \%ARGS;
@@ -79,10 +81,12 @@ 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
@@ -94,14 +98,13 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
-Vessel capacity:
+Vessel or capacity:
<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs',
thingstring => 'capacitystring', emsgstore => \$emsg,
- perresult => sub {
- ($max_volume,$max_mass) = @_;
- }
+ helpref => 'capacity',
+ onresults => sub { ($max_mass,$max_volume) = @_; }
&>
- size=30
+ size=40
&>
|
@@ -113,11 +116,25 @@ Expected losses:
<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll',
thingstring => 'lossperleague', emsgstore => \$emsg,
- perresult => sub { ($lossperleaguepct)= @_; }
+ helpref => 'losses',
+ onresults => sub { ($lossperleaguepct)= @_; }
&>
- size=10
+ size=9
&>
+ |
+
+
+Available capital:
+<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac',
+ thingstring => 'capitalstring', emsgstore => \$emsg,
+ helpref => 'capital',
+ onresults => sub { ($capital)= @_; }
+ &>
+ size=9
+&>
+ |
+
% } else { #---------- dropdowns, user selects from menus ----------
@@ -218,7 +235,7 @@ function ms_Setarch(dd) {
% my $ours= sub { $_[0] =~
-% m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^[RT]/;
+% m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^[RT]/;
% };
<& "lookup:formhidden", ours => $ours &>
@@ -266,7 +283,8 @@ for my $dd (0..$qa->{Dropdowns}-1) {
qa => $qa,
max_mass => $max_mass,
max_volume => $max_volume,
- lossperleaguepct => $lossperleaguepct
+ lossperleaguepct => $lossperleaguepct,
+ max_capital => $capital
&>
-
% }
+