From c5b3ac45babf8012719dfb7eafd0cfa9d9eddff0 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 16 Aug 2009 03:27:25 +0100
Subject: [PATCH] Fix some warnings

---
 yarrg/web/check_routestring | 2 +-
 yarrg/web/qtextstring       | 6 +++++-
 yarrg/web/query_age         | 3 +++
 yarrg/web/query_route       | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/yarrg/web/check_routestring b/yarrg/web/check_routestring
index 2cbe719..e66cbfb 100755
--- a/yarrg/web/check_routestring
+++ b/yarrg/web/check_routestring
@@ -89,7 +89,7 @@ foreach my $each (split m#[/|,]#, $string) {
 	push @results, $results->[0];
 };
 
-$dbh->disconnect();
+$dbh->rollback();
 
 return  $emsg,
 	(join ' | ', map { $_->[2] } @results),
diff --git a/yarrg/web/qtextstring b/yarrg/web/qtextstring
index 400716f..6efe368 100644
--- a/yarrg/web/qtextstring
+++ b/yarrg/web/qtextstring
@@ -37,6 +37,10 @@
 $thingstring
 $qa => $m->caller_args(1)->{'qa'}
 </%args>
+<%perl>
+my $stringval= $qa->{$thingstring};
+$stringval='' if !defined $stringval;
+</%perl>
 
 Enter route (islands, or archipelagoes, separated by |s or commas;
  abbreviations are OK):<br>
@@ -86,7 +90,7 @@ window.onload= ts_Needed;
 <input type="text" <% $m->content %>
  id="<% $thingstring %>" name="<% $thingstring %>"
  onchange="ts_Needed();" onkeyup="ts_Later();"
- value="<% $qa->{$thingstring} |h %>"
+ value="<% $stringval |h %>"
  >
 <br>
 <div id="ts_results">&nbsp;</div><br>
diff --git a/yarrg/web/query_age b/yarrg/web/query_age
index c5009d3..922e29f 100644
--- a/yarrg/web/query_age
+++ b/yarrg/web/query_age
@@ -130,3 +130,6 @@ use POSIX;
 use CommodsWeb;
 my $dbh= dbw_connect('Midnight');
 </%init>
+<%cleanup>
+$dbh->rollback();
+</%cleanup>
diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index dc1ebc9..ea94d61 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -108,6 +108,8 @@ foreach my $arch (keys %islandlistdata) {
 		$optionlistmap->($islandlistdata{$arch}, '');
 }
 
+$dbh->rollback();
+
 </%perl>
 
 <input type=hidden name=dropdowns value="<% $qa->{Dropdowns} |h %>">
-- 
2.30.2