chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Normalise commodity name case (from uploads)
[ypp-sc-tools.db-live.git]
/
yarrg
/
web
/
query_routesearch
diff --git
a/yarrg/web/query_routesearch
b/yarrg/web/query_routesearch
index 1deeb83edd527dd3ccc2faeda13ae391e728dcce..126c4e804d860a807d5abfb57b5dd36dd66a728c 100644
(file)
--- a/
yarrg/web/query_routesearch
+++ b/
yarrg/web/query_routesearch
@@
-51,6
+51,8
@@
$allargs
</%args>
<%perl>
</%args>
<%perl>
+no warnings qw(exec);
+
use BSD::Resource;
my $emsg;
use BSD::Resource;
my $emsg;
@@
-59,8
+61,8
@@
my @islandids;
my $destspec;
my $destspec;
-my
$maxmaxdist=35
;
-my $maxcpu=
1
;
+my
@maxmaxdist= qw(100 100 100)
;
+my $maxcpu=
90
;
my $concur_lim=5;
my $qa= \%ARGS;
my $concur_lim=5;
my $qa= \%ARGS;
@@
-73,6
+75,9
@@
my $maxcountea=15;
<div class="query">
<h1>Find most profitable routes and trades</h1>
<div class="query">
<h1>Find most profitable routes and trades</h1>
+% my $searchtype= $ARGS{RouteSearchType};
+% my $searchtype_show;
+%
% if ($qa->{Dropdowns}) {
This feature is not available from the "drop down menus" interface.
% } else {
% if ($qa->{Dropdowns}) {
This feature is not available from the "drop down menus" interface.
% } else {
@@
-86,12
+91,14
@@
This feature is not available from the "drop down menus" interface.
islandids_r => \@islandids, archipelagoes_r => undef
&>
islandids_r => \@islandids, archipelagoes_r => undef
&>
-% my $searchtype= $ARGS{RouteSearchType};
% if ($searchtype == 0) {
% $destspec= 'any';
% if ($searchtype == 0) {
% $destspec= 'any';
+% $searchtype_show= 'open-ended';
% } elsif ($searchtype == 1) {
% $destspec= 'circ';
% } elsif ($searchtype == 1) {
% $destspec= 'circ';
+% $searchtype_show= 'circular';
% } elsif ($searchtype == 2) {
% } elsif ($searchtype == 2) {
+% $searchtype_show= 'specific-destination';
Destination (one island only):
<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,
Destination (one island only):
<& qtextstring, qa => $qa, dbh => $dbh, emsgstore => \$emsg,
@@
-133,9
+140,11
@@
print STDERR "ONRESULTS @_\n";
<div class="results">
<%perl>
<div class="results">
<%perl>
+my $maxmaxdist= $maxmaxdist[$searchtype];
if (!$emsg && $maxdist > $maxmaxdist) {
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("</div>"), return
}
print("</div>"), return
@@
-174,7
+183,7
@@
foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs,
0; #$routeparams->{MinProfit}
;
+push @rsargs,
$routeparams->{MinProfit} // 0
;
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
push @rsargs, $destspec;
push @rsargs, @islandids;
push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea;
push @rsargs, $destspec;
push @rsargs, @islandids;
@@
-221,7
+230,7
@@
while (<$fh>) {
}
die unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
my ($ap,$isles) = (uc $1,$5);
}
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) {
my $item= { A => $3, P => $4, Leagues => $2 };
my (@i, @fi, @a);
foreach (split / /, $isles) {