Fix up search too long error message - really fix up

[ypp-sc-tools.main.git] / yarrg / web / query_routesearch

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 1828f374bc5b97e90546bc417d0b7bd5940d61f6..1deeb83edd527dd3ccc2faeda13ae391e728dcce 100644 (file)
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -60,7 +60,7 @@ my @islandids;
 my $destspec;
 
 my $maxmaxdist=35;
-my $maxcpu=90;
+my $maxcpu=1;
 my $concur_lim=5;
 
 my $qa= \%ARGS;
@@ -258,7 +258,7 @@ if (!close $fh) {
        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
@@ -266,16 +266,17 @@ avoid them consuming excessive resources on the server system, and 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
@@ -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.
 
+</div>
 <%perl>
        return;
 }