chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Query for vessel capacity
[ypp-sc-tools.db-test.git]
/
yarrg
/
web
/
query_route
diff --git
a/yarrg/web/query_route
b/yarrg/web/query_route
index b2c52b158f3b7c6531b48fbf9b0b34677ed56df8..d4a3bd15e4c06cd362765852d3e63bcc8c6284fd 100644
(file)
--- a/
yarrg/web/query_route
+++ b/
yarrg/web/query_route
@@
-38,6
+38,7
@@
$quri
$dbh
$prselector
$routestring => '';
$dbh
$prselector
$routestring => '';
+$capacitystring => '';
$someresults
$emsgokorprint
</%args>
$someresults
$emsgokorprint
</%args>
@@
-47,8
+48,19
@@
my $emsg;
my @archipelagoes;
my @islandids;
my %islandid2;
my @archipelagoes;
my @islandids;
my %islandid2;
+my ($max_volume, $max_mass);
my $qa= \%ARGS;
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' };
+
</%perl>
<h1>Specify route</h1>
</%perl>
<h1>Specify route</h1>
@@
-61,7
+73,7
@@
my $qa= \%ARGS;
Enter route (islands, or archipelagoes, separated by |s or commas;
abbreviations are OK):<br>
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, dbh => $dbh,
thingstring => 'routestring', emsgstore => \$emsg,
<&| qtextstring, qa => $qa, dbh => $dbh,
thingstring => 'routestring', emsgstore => \$emsg,
@@
-74,8
+86,22
@@
Enter route (islands, or archipelagoes, separated by |s or commas;
size=80
</&>
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 ----------
% } else { #---------- dropdowns, user selects from menus ----------
+% $startform->(grep {
+% defined $ARGS{"archipelago$_"} ||
+% defined $ARGS{"islandid$_"}
+% } (0..$qa->{Dropdowns}-1));
+
<%perl>
my ($sth,$row);
my @archlistdata;
<%perl>
my ($sth,$row);
my @archlistdata;
@@
-165,10
+191,11
@@
function ms_Setarch(dd) {
% } #---------- end of dropdowns, now common middle of page code ----------
% } #---------- 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|^[RT]/;
+% };
<& "lookup:formhidden", ours => $ours &>
<& "lookup:formhidden", ours => $ours &>
-</form>
<%perl>
#========== results ==========
<%perl>
#========== results ==========
@@
-206,11
+233,12
@@
for my $dd (0..$qa->{Dropdowns}-1) {
</%perl>
% if (@islandids) {
</%perl>
% if (@islandids) {
-% $someresults->();
+% $someresults->(
'Relevant trades'
);
<& routetrade,
dbh => $dbh,
islandids => \@islandids,
archipelagoes => \@archipelagoes,
qa => $qa
&>
<& routetrade,
dbh => $dbh,
islandids => \@islandids,
archipelagoes => \@archipelagoes,
qa => $qa
&>
+</form>
% }
% }