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=3f65fc3ca0aff7f15a35581c4e34fe9a38edb0c0;hp=357ba94ed39395e86d230801cef31fa53a9ef26d;hb=43454422b2df5e0dcfe144fcb871a2b6f9c1a3d0;hpb=3a24aecf857292701d755173ffdb91d10a3426c8
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 357ba94..3f65fc3 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -42,6 +42,7 @@ $islandstring => '';
$capacitystring => '';
$lossperleague => '';
$capitalstring => '';
+$minprofitstring => '';
$distance => '';
$prselector
$someresults
@@ -89,15 +90,14 @@ This feature is not available from the "drop down menus" interface.
Maximum distance:
- <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml',
- thingstring => 'distance', emsgstore => \$emsg,
- onresults => sub { ($maxdist)= @_; } &>
- size=10
- &>
+ <& qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml',
+ thingstring => 'distance', emsgstore => \$emsg, boxopts => 'size=10',
+ onresults => sub { ($maxdist)= @_; }
+ &>
&>
-% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; };
+% my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
<& "lookup:formhidden", ours => $ours &>
% }
@@ -147,7 +147,7 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, '0';
+push @rsargs, 0; #$routeparams->{MinProfit};
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any';
push @rsargs, @islandids;
|