From aaac8ff612afe5c10dd97a61f44870c24da4fcad Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 27 Oct 2009 01:31:42 +0000 Subject: [PATCH] query_routesearch: Properly propagate %baseqf (so we don't reset ocean etc.) --- yarrg/web/lookup | 3 ++- yarrg/web/query_routesearch | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/yarrg/web/lookup b/yarrg/web/lookup index a2ccc8d..56b34fc 100755 --- a/yarrg/web/lookup +++ b/yarrg/web/lookup @@ -259,7 +259,8 @@ $debug => 0 % } <& "query_$styles{Query}", %baseqf, %queryqf, %styles, - quri => $quri, dbh => $dbh, queryqf => \%queryqf, allargs => \%ARGS, + quri => $quri, dbh => $dbh, + baseqf => \%baseqf, queryqf => \%queryqf, allargs => \%ARGS, prselector => $prselector, someresults => $someresults, emsgokorprint => sub { 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); -- 2.30.2