Pass $dbh down through the stack, for better lifetime

[ypp-sc-tools.db-test.git] / yarrg / web / query_route

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 66dee1dd08135de011871b15d71d963f7db235af..e9e358a433bc928b325a773651441b9ee25971d4 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -35,6 +35,7 @@
 </%doc>
 <%args>
 $quri
+$dbh
 $routestring => '';
 $someresults
 $emsgokorprint
@@ -59,7 +60,8 @@ Enter route (islands, or archipelagoes, separated by |s or commas;
 
 <form action="<% $quri->() |h %>" method="get">
 
-<&| qtextstring, qa => $qa, thingstring => 'routestring', emsgstore => \$emsg,
+<&| qtextstring, qa => $qa, dbh => $dbh,
+    thingstring => 'routestring', emsgstore => \$emsg,
     perresult => sub {
        my ($canonname, $island, $arch) = @_;
        push @islandids, $island;
@@ -90,8 +92,6 @@ my $optionlistmap= sub {
        return $out;
 };
 
-my $dbh= dbw_connect($qa->{Ocean});
-
 $sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
                            ORDER BY archipelago;");
 $sth->execute();
@@ -120,8 +120,6 @@ foreach my $arch (keys %islandlistdata) {
                $optionlistmap->($islandlistdata{$arch}, '');
 }
 
-$dbh->rollback();
-
 </%perl>
 
 <&| script &>
@@ -206,5 +204,8 @@ for my $dd (0..$qa->{Dropdowns}-1) {
 
 % if (@islandids) {
 %      $someresults->();
-<& routetrade, islandids => \@islandids, archipelagoes => \@archipelagoes &>
+<& routetrade,
+   dbh => $dbh,
+   islandids => \@islandids,
+   archipelagoes => \@archipelagoes &>
 % }