chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New dataage mode actually works
[ypp-sc-tools.web-live.git]
/
yarrg
/
web
/
routetextstring
diff --git
a/yarrg/web/routetextstring
b/yarrg/web/routetextstring
index bf4a4a9988fe9b237736cac3ca06b67353fab4cf..4d59c7fa5e2d4b5697d9e55bb6a00aa7d1e90bc9 100644
(file)
--- a/
yarrg/web/routetextstring
+++ b/
yarrg/web/routetextstring
@@
-13,9
+13,9
@@
$string
use CommodsWeb;
use HTML::Entities;
use JSON;
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 ?
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);
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,
$r->content_type($ctype or $format);
$output= sub { print to_json({
success => 1,
@@
-37,10
+37,15
@@
if ($format =~ 'json') {
show => $_[0],
})};
}
show => $_[0],
})};
}
-if ($format =~
'return'
) {
+if ($format =~
/return/
) {
$output= sub { return { Error => '', Results => \@results }; };
$output_wrong= sub { return { Error => $_[0] }; };
}
$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;
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;
}
$canontext= join ' | ', map { $_->[2] } @results;
-
return $output->();
</%perl>
return $output->();
</%perl>