chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mistake "git core" should say "git clone"
[ypp-sc-tools.db-live.git]
/
yarrg
/
web
/
query_routesearch
diff --git
a/yarrg/web/query_routesearch
b/yarrg/web/query_routesearch
index 1828f374bc5b97e90546bc417d0b7bd5940d61f6..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
@@
-174,7
+181,7
@@
foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
}
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;
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
push @rsargs, $destspec;
push @rsargs, @islandids;
@@
-258,7
+265,7
@@
if (!close $fh) {
die $! if $!;
die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
</%perl>
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
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
+273,17
@@
avoid them consuming excessive resources on the server system, and to
make sure that shorter searches can still happen.
<p>
make sure that shorter searches can still happen.
<p>
-Please try a search with a smaller m
in
imum distance, or place more
+Please try a search with a smaller m
ax
imum distance, or place more
restrictions on the route.
restrictions on the route.
+</div>
<%perl>
return;
}
if ($concur_fail) {
</%perl>
<%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
Sorry, but there are already <% $concur_lim |h %> route searches
running. We limit the number which can run at once to avoid
@@
-292,6
+300,7
@@
avoid asking for large searches that you're not sure about.
Otherwise, please try later. Searches are limited to <% $maxcpu |h %>
seconds of CPU time so more processing resources should be available soon.
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;
}
<%perl>
return;
}