Pass $dbh down through the stack, for better lifetime

[ypp-sc-tools.db-live.git] / yarrg / web / lookup

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 1b85ecc8b9d06b9dc5ba96b14b63e4cac99501c0..f194fc5d56d2cb3f4a6a2e955dd0b84c3493cfc2 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -160,7 +160,8 @@ foreach my $var (@vars) {
 
 die if $styles{Query} =~ m/[^a-z]/;
 
-dbw_connect($styles{Ocean});
+my $mydbh;
+my $dbh= ($mydbh= dbw_connect($styles{Ocean}));
 
 my $results_head_done=0;
 my $someresults= sub {
@@ -176,7 +177,8 @@ $debug => 0
 
 <hr>
 
-<& "query_$styles{Query}", %baseqf, %queryqf, %styles, quri => $quri,
+<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
+    quri => $quri, dbh => $dbh,
     someresults => $someresults,
     emsgokorprint => sub {
        my ($emsg) = @_;
@@ -215,3 +217,8 @@ use HTML::Entities;
 use URI::Escape;
 
 </%init>
+<%cleanup>
+
+$mydbh->rollback() if $mydbh;
+
+</%cleanup>