X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fweb%2Fquery_routesearch;h=151824cdec7a8a77db75f0b6b1c0c1055a0da2fa;hb=59824f48d09192d1c535adecf5ee2e4ee2ed47d5;hp=9c583b8899338489228249fef319dc360e7d3883;hpb=6a4d494e0e31f95bdd6dd54b814e8b2381ad95b2;p=ypp-sc-tools.db-test.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 9c583b8..151824c 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -42,6 +42,7 @@ $islandstring => '';
$capacitystring => '';
$lossperleague => '';
$capitalstring => '';
+$minprofitstring => '';
$distance => '';
$prselector
$someresults
@@ -56,7 +57,9 @@ my $emsg;
my @warningfs;
my @islandids;
-my $maxmaxdist=35;
+my $destspec;
+
+my @maxmaxdist= qw(100 100 100);
my $maxcpu=90;
my $concur_lim=5;
@@ -70,6 +73,9 @@ my $maxcountea=15;
Find most profitable routes and trades
+% my $searchtype= $ARGS{RouteSearchType};
+% my $searchtype_show;
+%
% if ($qa->{Dropdowns}) {
This feature is not available from the "drop down menus" interface.
% } else {
@@ -83,21 +89,46 @@ This feature is not available from the "drop down menus" interface.
islandids_r => \@islandids, archipelagoes_r => undef
&>
+% if ($searchtype == 0) {
+% $destspec= 'any';
+% $searchtype_show= 'open-ended';
+% } elsif ($searchtype == 1) {
+% $destspec= 'circ';
+% $searchtype_show= 'circular';
+% } elsif ($searchtype == 2) {
+% $searchtype_show= 'specific-destination';
+
+Destination (one island only):
+<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,
+ thingstring => 'deststring',
+ prefix => 'ds', boxopts => 'size=40',
+ onresults => sub {
+print STDERR "ONRESULTS @_\n";
+ return unless @_;
+ my ($canonname, $island, $arch) = @{ $_[0] };
+ die unless defined $island;
+ $destspec= $island;
+ }
+ &>
+
+% } else {
+% die "$destspec ?";
+% }
+
<&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
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|^deststring|^capitalstring|^capacitystring|^minprofitstring|^distance/; };
<& "lookup:formhidden", ours => $ours &>
% }
@@ -107,15 +138,18 @@ This feature is not available from the "drop down menus" interface.
<%perl>
+my $maxmaxdist= $maxmaxdist[$searchtype];
if (!$emsg && $maxdist > $maxmaxdist) {
- $emsg= "Searching for routes of more than $maxmaxdist leagues is not".
- " supported, sorry.";
+ $emsg= "Searching for $searchtype_show routes".
+ " of more than $maxmaxdist leagues is not".
+ " supported, sorry.";
}
print("
"), return
unless $emsgokorprint->($emsg)
and @islandids
and $allargs->{'submit'}
+ and defined $destspec
and (defined $routeparams->{MaxMass} or
defined $routeparams->{MaxVolume});
@@ -147,9 +181,9 @@ foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, '0';
+push @rsargs, $routeparams->{MinProfit} // 0;
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
-push @rsargs, $ARGS{RouteSearchType} ? 'circ' : 'any';
+push @rsargs, $destspec;
push @rsargs, @islandids;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
@@ -194,7 +228,7 @@ while (<$fh>) {
}
die unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
my ($ap,$isles) = (uc $1,$5);
- next if $results{$ap} && %{$results{$ap}} >= $maxcountea;
+ next if $results{$ap} && keys %{$results{$ap}} >= $maxcountea;
my $item= { A => $3, P => $4, Leagues => $2 };
my (@i, @fi, @a);
foreach (split / /, $isles) {
@@ -231,7 +265,7 @@ if (!close $fh) {
die $! if $!;
die $? if $? != 24; # SIGXCPU but not in POSIX.pm :-/
%perl>
-
Search took too long and was terminated
+% $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
@@ -239,16 +273,17 @@ avoid them consuming excessive resources on the server system, and to
make sure that shorter searches can still happen.
-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>
return;
}
if ($concur_fail) {
%perl>
-
Server too busy
+% $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
@@ -257,7 +292,7 @@ YARRG website still runs quickly.
If you submitted several searches and gave up on them (eg by hitting
-`back' or `stop' in your browser), be aware that that doesn't
+"back" or "stop" in your browser), be aware that that doesn't
generally stop the search process at the server end. So it's best to
avoid asking for large searches that you're not sure about.
@@ -265,6 +300,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.
+
<%perl>
return;
}
@@ -345,7 +381,7 @@ $someresults->();
Notes
Per league values count each island visited as one
-(additional) league; the `Dist.' column is however the actual distance
+(additional) league; the "Dist." column is however the actual distance
to be sailed. All profit figures are somewhat approximate; get a
complete trading plan for a route for accurate information.