From: Ian Jackson Date: Wed, 12 Aug 2009 23:47:59 +0000 (+0100) Subject: Data::Dumper output from routetextstring X-Git-Tag: 3.4~211 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=commitdiff_plain;h=44ad4cede24bbf34e0404feb993118496d7e3fb5 Data::Dumper output from routetextstring --- diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring index bf4a4a9..d66e756 100644 --- a/yarrg/web/routetextstring +++ b/yarrg/web/routetextstring @@ -13,6 +13,7 @@ $string use CommodsWeb; use HTML::Entities; use JSON; +use Data::Dumper; db_setocean($ocean); db_connect(); @@ -25,7 +26,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 +38,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;