chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uncomment minprofit in route search (!)
[ypp-sc-tools.db-test.git]
/
yarrg
/
web
/
query_routesearch
diff --git
a/yarrg/web/query_routesearch
b/yarrg/web/query_routesearch
index 1828f374bc5b97e90546bc417d0b7bd5940d61f6..1bbaf9f5715d8a4a76be4fe0171fe48b4ff5013d 100644
(file)
--- a/
yarrg/web/query_routesearch
+++ b/
yarrg/web/query_routesearch
@@
-174,7
+174,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
+258,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
+266,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
+293,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;
}