X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=1bbaf9f5715d8a4a76be4fe0171fe48b4ff5013d;hb=b5cdb0d90df8dde3653e2a1d8d2c3e1c2d04af3e;hp=9c583b8899338489228249fef319dc360e7d3883;hpb=05a607330cc73832ccc778cd10f69cbac8e6dba3;p=ypp-sc-tools.db-test.git diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index 9c583b8..1bbaf9f 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -42,6 +42,7 @@ $islandstring => ''; $capacitystring => ''; $lossperleague => ''; $capitalstring => ''; +$minprofitstring => ''; $distance => ''; $prselector $someresults @@ -56,6 +57,8 @@ my $emsg; my @warningfs; my @islandids; +my $destspec; + my $maxmaxdist=35; my $maxcpu=90; my $concur_lim=5; @@ -83,21 +86,44 @@ This feature is not available from the "drop down menus" interface. islandids_r => \@islandids, archipelagoes_r => undef &> +% my $searchtype= $ARGS{RouteSearchType}; +% if ($searchtype == 0) { +% $destspec= 'any'; +% } elsif ($searchtype == 1) { +% $destspec= 'circ'; +% } elsif ($searchtype == 2) { + +Destination (one island only): +<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg, + thingstring => 'deststring', + prefix => 'ds', boxopts => 'size=40', + onresults => sub { +print STDERR "ONRESULTS @_\n"; + return unless @_; + my ($canonname, $island, $arch) = @{ $_[0] }; + die unless defined $island; + $destspec= $island; + } + &> + +% } else { +% die "$destspec ?"; +% } + <&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
-Please try a search with a smaller minimum distance, or place more +Please try a search with a smaller maximum distance, or place more restrictions on the route. + <%perl> return; } if ($concur_fail) { %perl> -
If you submitted several searches and gave up on them (eg by hitting -`back' or `stop' in your browser), be aware that that doesn't +"back" or "stop" in your browser), be aware that that doesn't generally stop the search process at the server end. So it's best to avoid asking for large searches that you're not sure about. @@ -265,6 +293,7 @@ avoid asking for large searches that you're not sure about. Otherwise, please try later. Searches are limited to <% $maxcpu |h %> seconds of CPU time so more processing resources should be available soon. + <%perl> return; } @@ -345,7 +374,7 @@ $someresults->();