Merge branch 'test-install'

[ypp-sc-tools.db-test.git] / yarrg / web / query_route

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index e9e358a433bc928b325a773651441b9ee25971d4..393e7a668755145d05262a56b56ed005330669c1 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -36,6 +36,7 @@
 <%args>
 $quri
 $dbh
+$prselector
 $routestring => '';
 $someresults
 $emsgokorprint
@@ -48,17 +49,29 @@ my @islandids;
 my %islandid2;
 
 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' };
 
-%#---------- textbox, user enters route as string ----------
-% if (!$qa->{Dropdowns}) {
+</%perl>
 
 <h1>Specify route</h1>
 
+% $prselector->('ShowStalls');
+
+%#---------- textbox, user enters route as string ----------
+% if (!$qa->{Dropdowns}) {
+
 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,
@@ -73,6 +86,11 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
 
 % } else { #---------- dropdowns, user selects from menus ----------
 
+% $startform->(grep {
+%              defined $ARGS{"archipelago$_"} ||
+%              defined $ARGS{"islandid$_"}
+%      } (0..$qa->{Dropdowns}-1));
+
 <%perl>
 my ($sth,$row);
 my @archlistdata;
@@ -162,10 +180,9 @@ function ms_Setarch(dd) {
 
 % } #---------- 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|^[RT]/; };
 <& "lookup:formhidden", ours => $ours &>
-</form>
 
 <%perl>
 #========== results ==========
@@ -203,9 +220,12 @@ for my $dd (0..$qa->{Dropdowns}-1) {
 </%perl>
 
 % if (@islandids) {
-%      $someresults->();
+%      $someresults->('Relevant trades');
 <& routetrade,
    dbh => $dbh,
    islandids => \@islandids,
-   archipelagoes => \@archipelagoes &>
+   archipelagoes => \@archipelagoes,
+   qa => $qa
+ &>
+</form>
 % }