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=65f57f881531797d36bd7df6f1b39c3db331fce2;hp=fadc20ed8db5d0b5b12e6942ba09742c9fa3854b;hb=ce49620ef8a4e24daa206185138919bb58d35d37;hpb=cb6af6f4bf6b6c3f7852912ebec58e773a724a5a

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index fadc20e..65f57f8 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -42,8 +42,10 @@ $capacitystring => '';
 $lossperleague => '';
 $capitalstring => '';
 $distance => '';
+$prselector
 $someresults
 $emsgokorprint
+$allargs
 </%args>
 
 <%perl>
@@ -70,6 +72,8 @@ my $maxcountea=15;
 This feature is not available from the "drop down menus" interface.
 % } else {
 
+% $prselector->('RouteSearchType');
+
 <form action="<% $quri->() |h %>" method="get">
 
 <& enter_route, qa=>$qa, dbh=>$dbh, emsg_r=>\$emsg, warningfs_r=>\@warningfs,
@@ -106,6 +110,7 @@ if (!$emsg && $maxdist > $maxmaxdist) {
 
 $emsgokorprint->($emsg) or return;
 @islandids or return;
+$allargs->{'submit'} or return;
 defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return;
 
 #---------- prepare island names ----------
@@ -137,7 +142,9 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
 push @rsargs, defined $routeparams->{LossPerLeaguePct}
 	? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
 push @rsargs, '0';
-push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, 'any', @islandids;
+push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
+push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any';
+push @rsargs, @islandids;
 
 m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;