chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
query_routesearch: Properly propagate %baseqf (so we don't reset ocean etc.)
[ypp-sc-tools.main.git]
/
yarrg
/
web
/
query_routesearch
diff --git
a/yarrg/web/query_routesearch
b/yarrg/web/query_routesearch
index 65f57f881531797d36bd7df6f1b39c3db331fce2..89a81371845c06069fe43b197a6ad8d945e89abb 100644
(file)
--- a/
yarrg/web/query_routesearch
+++ b/
yarrg/web/query_routesearch
@@
-36,6
+36,7
@@
<%args>
$quri
$dbh
<%args>
$quri
$dbh
+$baseqf
$queryqf
$islandstring => '';
$capacitystring => '';
$queryqf
$islandstring => '';
$capacitystring => '';
@@
-206,7
+207,7
@@
while (<$fh>) {
for ($i=1; $i < @i-1; $i++) {
push @{ $item->{Vias} }, $i[$i];
}
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);
delete $linkqf{'query'};
$linkqf{'routestring'}= join ', ', @fi;
$item->{Url}= $quri->(%linkqf);