Fix up search too long error message - really

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

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index d56f77d6832e1c81593fdd39f90c28cb4d8695f5..81a71d28ed789508d0fec44a125388fbd5750c22 100644 (file)
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -123,10 +123,10 @@ print STDERR "ONRESULTS @_\n";
 </&>
 
 <input type=submit name=submit value="Search">
-% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
+% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^deststring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
 <& "lookup:formhidden", ours => $ours &>
 
-s% }
+% }
 
 </form>
 </div>
@@ -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,7 +266,7 @@ 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.
 
 <%perl>
@@ -275,7 +275,7 @@ restrictions on the route.
 
 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