X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=3bdc7f77f09d0765f079d77534ac0e4f12ab8d33;hp=f8a697ac902df640c63bb7b7cd026169014014a6;hb=f8abaac789a49c036e513127ac2051c3c9fe0f5e;hpb=af39a7a548ed86c8c1f048930fb9e69c0cb809e7

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index f8a697a..3bdc7f7 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -123,7 +123,7 @@ 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 &>
 
 % }
@@ -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;
 }