X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=dd8644f1675694d200e28341d0b32bc5d6396422;hb=b6d8c4a781c0bedf79a4b13af5afe9ad47de97ed;hp=dc1ebc9917608eaf7a596e7d3eaf95e58165676a;hpb=dfae6286760f90eec22d236d57014f68149161ad;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index dc1ebc9..dd8644f 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -35,7 +35,6 @@
 </%doc>
 <%args>
 $quri
-$qa
 $routestring => '';
 </%args>
 <%perl>
@@ -44,6 +43,7 @@ my @archipelagoes;
 my @islandids;
 my %islandid2;
 
+my $qa= \%ARGS;
 </%perl>
 
 %#---------- textbox, user enters route as string ----------
@@ -108,6 +108,8 @@ foreach my $arch (keys %islandlistdata) {
 		$optionlistmap->($islandlistdata{$arch}, '');
 }
 
+$dbh->rollback();
+
 </%perl>
 
 <input type=hidden name=dropdowns value="<% $qa->{Dropdowns} |h %>">
@@ -168,7 +170,8 @@ $results_head= sub {
 if (!$qa->{Dropdowns}) {
   if (length $routestring) {
 	$results_head->();
-	my ($emsg,$canonstring,$results)= $m->comp('check_routestring',
+	my ($emsg,$canonstring,$results)= $m->comp('qtextstringcheck',
+		what => 'routestring',
 		ocean => $qa->{Ocean},
 		string => $routestring,
 		format => 'return'
@@ -177,9 +180,9 @@ if (!$qa->{Dropdowns}) {
 		print encode_entities($emsg);
 	} else {
 		foreach my $entry (@$results) {
-			push @archipelagoes,
-				defined $entry->[1] ? undef : $entry->[0];
 			push @islandids, $entry->[1];
+			push @archipelagoes,
+				defined $entry->[1] ? undef : $entry->[2];
 		} 
 	}
   }