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 70d614483d4efe3de4888af97413388628d2061d..4d59c7fa5e2d4b5697d9e55bb6a00aa7d1e90bc9 100644 (file)
--- 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,18 +25,27 @@ 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,
                show => length $canontext ? encode_entities($canontext)
                        : ' ',
-       })};
+               })};
        $output_wrong= sub { print to_json({
                success => 0,
                show => $_[0],
-       })};
-}              
+               })};
+}
+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;
@@ -44,32 +53,30 @@ foreach my $each (split m#[/|,]#, $string) {
        my $err= sub {
                my $msg= sprintf $_[0], encode_entities($each);
                $output_wrong->($msg);
-               $m->abort();
        };
-       my @m;
+       my %m;
        my $results;
        foreach my $pat ("$each\%", "\%$each\%") {
                $sth->execute($pat,$pat);
                $results= $sth->fetchall_arrayref();
                last if @$results==1;
-               push @m, @$results;
+               map { $m{ $_->[2] }=1 } @$results;
                $results= undef;
        }
        if (!$results) {
-               if (!@m) {
-                       $err->('no island or arch matches "%s"');
-               } elsif (@m > 3) {
-                       $err->(' ');
+               if (!%m) {
+                       return $err->('no island or arch matches "%s"');
+               } elsif (%m > 5) {
+                       return $err->(' ');
                } else {
-                       $err->('ambiguous island or arch "%s", could be '.
-                               join(', ', map { $_->[2] } @m));
+                       return $err->('ambiguous island or arch "%s",'.
+                               ' could be '.join(', ', sort keys %m));
                }
        }
        push @results, $results->[0];
 }
 
 $canontext= join ' | ', map { $_->[2] } @results;
-
-$output->();
+return $output->();
 
 </%perl>