X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=6cf098ed82c63c8cfce1fe93fe6e889460415675;hb=70ce19058c58f923f4957344502177202c7ee733;hp=aa118dd0dac4d32bcde87f6d2aefbe3ee3bb23c7;hpb=a07016480861871e840184d31e07d555ed991831;p=ypp-sc-tools.main.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index aa118dd..6cf098e 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -59,7 +59,7 @@ my @islandids;
my $destspec;
-my $maxmaxdist=35;
+my @maxmaxdist= qw(35 35 60);
my $maxcpu=90;
my $concur_lim=5;
@@ -73,6 +73,9 @@ my $maxcountea=15;
Find most profitable routes and trades
+% my $searchtype= $ARGS{RouteSearchType};
+% my $searchtype_show;
+%
% if ($qa->{Dropdowns}) {
This feature is not available from the "drop down menus" interface.
% } else {
@@ -86,12 +89,14 @@ 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';
+% $searchtype_show= 'open-ended';
% } elsif ($searchtype == 1) {
% $destspec= 'circ';
+% $searchtype_show= 'circular';
% } elsif ($searchtype == 2) {
+% $searchtype_show= 'specific-destination';
Destination (one island only):
<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,
@@ -133,9 +138,11 @@ print STDERR "ONRESULTS @_\n";
<%perl>
+my $maxmaxdist= $maxmaxdist[$searchtype];
if (!$emsg && $maxdist > $maxmaxdist) {
- $emsg= "Searching for routes of more than $maxmaxdist leagues is not".
- " supported, sorry.";
+ $emsg= "Searching for $searchtype_show routes".
+ " of more than $maxmaxdist leagues is not".
+ " supported, sorry.";
}
print("
"), return
@@ -174,7 +181,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 +265,7 @@ if (!close $fh) {
die $! if $!;
die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
%perl>
-% 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 +276,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 +300,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;
}