X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=126c4e804d860a807d5abfb57b5dd36dd66a728c;hb=0c3aa82b2a089f147cdeb12768b4e2eba2c34a8f;hp=1828f374bc5b97e90546bc417d0b7bd5940d61f6;hpb=f62749dec2d8b67a9b4b4a910e1159907654d426;p=ypp-sc-tools.main.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 1828f37..126c4e8 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -51,6 +51,8 @@ $allargs
%args>
<%perl>
+no warnings qw(exec);
+
use BSD::Resource;
my $emsg;
@@ -59,7 +61,7 @@ my @islandids;
my $destspec;
-my $maxmaxdist=35;
+my @maxmaxdist= qw(100 100 100);
my $maxcpu=90;
my $concur_lim=5;
@@ -73,6 +75,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 +91,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 +140,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 +183,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} // 0;
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
push @rsargs, $destspec;
push @rsargs, @islandids;
@@ -221,7 +230,7 @@ while (<$fh>) {
}
die unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
my ($ap,$isles) = (uc $1,$5);
- next if $results{$ap} && %{$results{$ap}} >= $maxcountea;
+ next if $results{$ap} && keys %{$results{$ap}} >= $maxcountea;
my $item= { A => $3, P => $4, Leagues => $2 };
my (@i, @fi, @a);
foreach (split / /, $isles) {
@@ -258,7 +267,7 @@ if (!close $fh) {
die $! if $!;
die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
%perl>
-
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
@@ -266,16 +275,17 @@ avoid them consuming excessive resources on the server system, and to
make sure that shorter searches can still happen.
-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>
-