chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routesearch: support circular routes
[ypp-sc-tools.main.git]
/
yarrg
/
web
/
query_routesearch
diff --git
a/yarrg/web/query_routesearch
b/yarrg/web/query_routesearch
index fadc20ed8db5d0b5b12e6942ba09742c9fa3854b..65f57f881531797d36bd7df6f1b39c3db331fce2 100644
(file)
--- a/
yarrg/web/query_routesearch
+++ b/
yarrg/web/query_routesearch
@@
-42,8
+42,10
@@
$capacitystring => '';
$lossperleague => '';
$capitalstring => '';
$distance => '';
$lossperleague => '';
$capitalstring => '';
$distance => '';
+$prselector
$someresults
$emsgokorprint
$someresults
$emsgokorprint
+$allargs
</%args>
<%perl>
</%args>
<%perl>
@@
-70,6
+72,8
@@
my $maxcountea=15;
This feature is not available from the "drop down menus" interface.
% } else {
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,
<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;
$emsgokorprint->($emsg) or return;
@islandids or return;
+$allargs->{'submit'} or return;
defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return;
#---------- prepare island names ----------
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, 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;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;