X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=6cf098ed82c63c8cfce1fe93fe6e889460415675;hp=1deeb83edd527dd3ccc2faeda13ae391e728dcce;hb=82e1631405dbf48b91e3bd1f31d31d63395906fd;hpb=59393edc418d7062f6fb074a90d3b8e810c43772

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 1deeb83..6cf098e 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -59,8 +59,8 @@ my @islandids;
 
 my $destspec;
 
-my $maxmaxdist=35;
-my $maxcpu=1;
+my @maxmaxdist= qw(35 35 60);
+my $maxcpu=90;
 my $concur_lim=5;
 
 my $qa= \%ARGS;
@@ -73,6 +73,9 @@ my $maxcountea=15;
 <div class="query">
 <h1>Find most profitable routes and trades</h1>
 
+% 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";
 <div class="results">
 <%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("</div>"), 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;