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=bf4a4a9988fe9b237736cac3ca06b67353fab4cf;hb=2961c979e0f7bdae7183d49ab7fab5f5830dff4e;hpb=7548896aab16af6ec42c6be252b7f5f876e2fea0

diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
index bf4a4a9..4d59c7f 100644
--- a/yarrg/web/routetextstring
+++ b/yarrg/web/routetextstring
@@ -13,9 +13,9 @@ $string
 use CommodsWeb;
 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 ?
@@ -25,7 +25,7 @@ my $sth= $dbh->prepare("SELECT archipelago,islandid,islandname
 my (@results, $canontext);
 my ($output, $output_wrong);
 
-if ($format =~ 'json') {
+if ($format =~ /json/) {
 	$r->content_type($ctype or $format);
 	$output= sub { print to_json({
 		success => 1,
@@ -37,10 +37,15 @@ if ($format =~ 'json') {
 		show => $_[0],
 		})};
 }
-if ($format =~ 'return') {
+if ($format =~ /return/) {
 	$output= sub { return { Error => '', Results => \@results }; };
 	$output_wrong= sub { return { Error => $_[0] }; };
 }
+if ($format =~ /dump/) {
+	$r->content_type('text/plain');
+	$output_wrong= sub { print Dumper(\@_); };
+	$output= sub { print Dumper(\@results, $canontext); };
+}
 
 foreach my $each (split m#[/|,]#, $string) {
 	$each =~ s/^\s*//;  $each =~ s/\s*$//;  $each =~ s/\s+/ /g;
@@ -72,7 +77,6 @@ foreach my $each (split m#[/|,]#, $string) {
 }
 
 $canontext= join ' | ', map { $_->[2] } @results;
-
 return $output->();
 
 </%perl>