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=2816086c068c9ed39a92e2e0221c649048f3dee9;hp=65f57f881531797d36bd7df6f1b39c3db331fce2;hb=29010a75143814a91b4f5200454bea879280e7c1;hpb=a1fb96b672d234f5961a397215c19c2c631c5cc3
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 65f57f8..2816086 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) {
@@ -206,7 +210,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 +276,7 @@ $someresults->();
% } else {
Best routes for profit per league
% }
-
+
@@ -343,8 +347,3 @@ Per league values count each island visited as one
(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>