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=aa118dd0dac4d32bcde87f6d2aefbe3ee3bb23c7;hpb=a07016480861871e840184d31e07d555ed991831;p=ypp-sc-tools.db-test.git diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index aa118dd..1bbaf9f 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -174,7 +174,7 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) { } push @rsargs, defined $routeparams->{LossPerLeaguePct} ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9; -push @rsargs, 0; #$routeparams->{MinProfit}; +push @rsargs, $routeparams->{MinProfit}; push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea; push @rsargs, $destspec; push @rsargs, @islandids; @@ -258,7 +258,7 @@ if (!close $fh) { die $! if $!; die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/ -% someresults->('Search took too long and was terminated'); +% $someresults->('Search took too long and was terminated'); Sorry, but your query resulted in a search that took too long. Searches are limited to <% $maxcpu |h %> seconds of CPU time to @@ -269,6 +269,7 @@ make sure that shorter searches can still happen. Please try a search with a smaller maximum distance, or place more restrictions on the route. + <%perl> return; } @@ -292,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; }