X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=478b622d8dcef39acb7933de2231b0886e6539de;hb=3276ebe915a34abf34cf9639e83c85b8adac5245;hp=1bbaf9f5715d8a4a76be4fe0171fe48b4ff5013d;hpb=b5cdb0d90df8dde3653e2a1d8d2c3e1c2d04af3e;p=ypp-sc-tools.web-test.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 1bbaf9f..478b622 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(100 100 100);
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, $routeparams->{MinProfit};
+push @rsargs, $routeparams->{MinProfit} // 0;
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
push @rsargs, $destspec;
push @rsargs, @islandids;