<%perl>
if (!$emsg && $maxdist > $maxmaxdist) {
@@ -108,10 +138,13 @@ if (!$emsg && $maxdist > $maxmaxdist) {
" supported, sorry.";
}
-$emsgokorprint->($emsg) or return;
-@islandids or return;
-$allargs->{'submit'} or return;
-defined $routeparams->{MaxMass} or defined $routeparams->{MaxVolume} or return;
+print("
"), return
+ unless $emsgokorprint->($emsg)
+ and @islandids
+ and $allargs->{'submit'}
+ and defined $destspec
+ and (defined $routeparams->{MaxMass} or
+ defined $routeparams->{MaxVolume});
#---------- prepare island names ----------
@@ -141,9 +174,9 @@ 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, $destspec;
push @rsargs, @islandids;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
@@ -206,7 +239,7 @@ while (<$fh>) {
for ($i=1; $i < @i-1; $i++) {
push @{ $item->{Vias} }, $i[$i];
}
- my %linkqf= %$queryqf;
+ my %linkqf= (%$baseqf, %$queryqf);
delete $linkqf{'query'};
$linkqf{'routestring'}= join ', ', @fi;
$item->{Url}= $quri->(%linkqf);
@@ -251,7 +284,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.
@@ -272,7 +305,7 @@ $someresults->();
% } else {
Best routes for profit per league
% }
-
+
@@ -292,7 +325,6 @@ $someresults->();
Start
Via
Finish
-
% my $datarow=0;
% my %sortkeys;
@@ -340,11 +372,8 @@ $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.
-<%perl>
-
-
-%perl>
+