X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=9c583b8899338489228249fef319dc360e7d3883;hb=59316f0dcddd4e5d15e47dfde36f513e1685c4ae;hp=65f57f881531797d36bd7df6f1b39c3db331fce2;hpb=3ce667a2d3fd7c36f60da86bb59071264790e375;p=ypp-sc-tools.main.git
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 65f57f8..9c583b8 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -36,6 +36,7 @@
<%args>
$quri
$dbh
+$baseqf
$queryqf
$islandstring => '';
$capacitystring => '';
@@ -66,6 +67,7 @@ my $maxcountea=15;
%perl>
+
Find most profitable routes and trades
% if ($qa->{Dropdowns}) {
@@ -101,6 +103,8 @@ This feature is not available from the "drop down menus" interface.
% }
+
+
<%perl>
if (!$emsg && $maxdist > $maxmaxdist) {
@@ -108,10 +112,12 @@ 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 $routeparams->{MaxMass} or
+ defined $routeparams->{MaxVolume});
#---------- prepare island names ----------
@@ -206,7 +212,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);
@@ -272,7 +278,7 @@ $someresults->();
% } else {
Best routes for profit per league
% }
-
+
@@ -292,7 +298,6 @@ $someresults->();
Start
| Via
| Finish
- |
| | | | | |
% my $datarow=0;
% my %sortkeys;
@@ -344,7 +349,4 @@ Per league values count each island visited as one
to be sailed. All profit figures are somewhat approximate; get a
complete trading plan for a route for accurate information.
-<%perl>
-
-
-%perl>
+
|
---|