query_routesearch: Properly propagate %baseqf (so we don't reset ocean etc.)

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index a2ccc8de0a80df6b3659fafc95bdc41976888deb..56b34fc36fb09d228cb4d9598f5c138a507ef444 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -259,7 +259,8 @@ $debug => 0
 % }
 
 <& "query_$styles{Query}", %baseqf, %queryqf, %styles,
 % }
 
 <& "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 {
     prselector => $prselector,
     someresults => $someresults,
     emsgokorprint => sub {

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);