X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=89a81371845c06069fe43b197a6ad8d945e89abb;hp=65f57f881531797d36bd7df6f1b39c3db331fce2;hb=aaac8ff612afe5c10dd97a61f44870c24da4fcad;hpb=6302552bfa5844eddb7c26386c9995733f0a5174 diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch index 65f57f8..89a8137 100644 --- a/yarrg/web/query_routesearch +++ b/yarrg/web/query_routesearch @@ -36,6 +36,7 @@ <%args> $quri $dbh +$baseqf $queryqf $islandstring => ''; $capacitystring => ''; @@ -206,7 +207,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);