Totals

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

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index ee726a9ced8d0a6c024c6d83bc3aaa95a7966882..be1196e899ab3fa8e99c8c9b975a59b4ff6ebc10 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -36,6 +36,7 @@
 <%args>
 $quri
 $dbh
+$prselector
 $routestring => '';
 $someresults
 $emsgokorprint
@@ -50,11 +51,13 @@ my %islandid2;
 my $qa= \%ARGS;
 </%perl>
 
+<h1>Specify route</h1>
+
+% $prselector->('ShowStalls');
+
 %#---------- textbox, user enters route as string ----------
 % if (!$qa->{Dropdowns}) {
 
-<h1>Specify route</h1>
-
 Enter route (islands, or archipelagoes, separated by |s or commas;
  abbreviations are OK):<br>
 
@@ -163,9 +166,8 @@ 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/; };
+% my $ours= sub { $_[0] =~ m/^island|^archipelago|^routestring|^[RT]/; };
 <& "lookup:formhidden", ours => $ours &>
-</form>
 
 <%perl>
 #========== results ==========
@@ -203,11 +205,12 @@ for my $dd (0..$qa->{Dropdowns}-1) {
 </%perl>
 
 % if (@islandids) {
-%      $someresults->();
+%      $someresults->('Relevant trades');
 <& routetrade,
    dbh => $dbh,
    islandids => \@islandids,
    archipelagoes => \@archipelagoes,
    qa => $qa
  &>
+</form>
 % }