X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetextstring;h=4d59c7fa5e2d4b5697d9e55bb6a00aa7d1e90bc9;hp=d66e756b1a4e9f3517cb8055b3a927918a03d27e;hb=c363ec70c47a05f429b3bda15f4a4e42d5233eb2;hpb=44ad4cede24bbf34e0404feb993118496d7e3fb5

diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
index d66e756..4d59c7f 100644
--- a/yarrg/web/routetextstring
+++ b/yarrg/web/routetextstring
@@ -15,8 +15,7 @@ use HTML::Entities;
 use JSON;
 use Data::Dumper;
 
-db_setocean($ocean);
-db_connect();
+my $dbh= dbw_connect($ocean);
 
 my $sth= $dbh->prepare("SELECT archipelago,islandid,islandname
 	 			FROM islands WHERE islandname LIKE ?
@@ -78,7 +77,6 @@ foreach my $each (split m#[/|,]#, $string) {
 }
 
 $canontext= join ' | ', map { $_->[2] } @results;
-
 return $output->();
 
 </%perl>