$capacitystring => '';
$lossperleague => '';
$capitalstring => '';
+$minprofitstring => '';
$distance => '';
$prselector
$someresults
my @warningfs;
my @islandids;
-my $maxmaxdist=35;
+my $destspec;
+
+my @maxmaxdist= qw(100 100 100);
my $maxcpu=90;
my $concur_lim=5;
<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 {
islandids_r => \@islandids, archipelagoes_r => undef
&>
+% 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,
+ thingstring => 'deststring',
+ prefix => 'ds', boxopts => 'size=40',
+ onresults => sub {
+print STDERR "ONRESULTS @_\n";
+ return unless @_;
+ my ($canonname, $island, $arch) = @{ $_[0] };
+ die unless defined $island;
+ $destspec= $island;
+ }
+ &>
+
+% } else {
+% die "$destspec ?";
+% }
+
<&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
<td>
<td>
Maximum distance:
- <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml',
- thingstring => 'distance', emsgstore => \$emsg,
- onresults => sub { ($maxdist)= @_; } &>
- size=10
- </&>
+ <& qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml',
+ thingstring => 'distance', emsgstore => \$emsg, boxopts => 'size=10',
+ onresults => sub { ($maxdist)= @_; }
+ &>
</&>
<input type=submit name=submit value="Search">
-% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; };
+% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^deststring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
<& "lookup:formhidden", ours => $ours &>
% }
<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
unless $emsgokorprint->($emsg)
and @islandids
and $allargs->{'submit'}
+ and defined $destspec
and (defined $routeparams->{MaxMass} or
defined $routeparams->{MaxVolume});
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, '0';
+push @rsargs, $routeparams->{MinProfit};
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
-push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any';
+push @rsargs, $destspec;
push @rsargs, @islandids;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
die $! if $!;
die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
</%perl>
-<h2>Search took too long and was terminated</h2>
+% $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
make sure that shorter searches can still happen.
<p>
-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.
+</div>
<%perl>
return;
}
if ($concur_fail) {
</%perl>
-<h2>Server too busy</h2>
+% $someresults->('Server too busy');
Sorry, but there are already <% $concur_lim |h %> route searches
running. We limit the number which can run at once to avoid
Otherwise, please try later. Searches are limited to <% $maxcpu |h %>
seconds of CPU time so more processing resources should be available soon.
+</div>
<%perl>
return;
}