Bigger limit for specific-destination route searches

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 1bbaf9f5715d8a4a76be4fe0171fe48b4ff5013d..6cf098ed82c63c8cfce1fe93fe6e889460415675 100644 (file)
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -59,7 +59,7 @@ my @islandids;
 
 my $destspec;
 
 
 my $destspec;
 

-my $maxmaxdist=35;
+my @maxmaxdist= qw(35 35 60);

 my $maxcpu=90;
 my $concur_lim=5;
 
 my $maxcpu=90;
 my $concur_lim=5;
 


@@ -73,6 +73,9 @@ my $maxcountea=15;
 <div class="query">
 <h1>Find most profitable routes and trades</h1>
 
 <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 {
 % 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
  &>
 
        islandids_r => \@islandids, archipelagoes_r => undef
  &>
 

-% my $searchtype= $ARGS{RouteSearchType};

 % if ($searchtype == 0) {
 %      $destspec= 'any';
 % if ($searchtype == 0) {
 %      $destspec= 'any';

+%      $searchtype_show= 'open-ended';

 % } elsif ($searchtype == 1) {
 %      $destspec= 'circ';
 % } elsif ($searchtype == 1) {
 %      $destspec= 'circ';

+%      $searchtype_show= 'circular';

 % } elsif ($searchtype == 2) {
 % } elsif ($searchtype == 2) {

+%      $searchtype_show= 'specific-destination';

 
 Destination (one island only):
 <& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,
 
 Destination (one island only):
 <& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,


@@ -133,9 +138,11 @@ print STDERR "ONRESULTS @_\n";
 <div class="results">
 <%perl>
 
 <div class="results">
 <%perl>
 

+my $maxmaxdist= $maxmaxdist[$searchtype];

 if (!$emsg && $maxdist > $maxmaxdist) {
 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
 }
 
 print("</div>"), return