Error handling and other cleanups

[ypp-sc-tools.web-live.git] / yarrg / web / routetextstring

diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
index 0e4ae6eaf2b37d5786c05800ab1497dd7d1c6302..bf4a4a9988fe9b237736cac3ca06b67353fab4cf 100644 (file)
--- a/yarrg/web/routetextstring
+++ b/yarrg/web/routetextstring
@@ -6,6 +6,10 @@ $string
 </%args>
 <%perl>
 
+# typical url for this script:
+#  http://www.chiark.greenend.org.uk/ucgi/~clareb/mason/pirates/routetextstring?format=json&ocean=Midnight&string=d
+
+
 use CommodsWeb;
 use HTML::Entities;
 use JSON;
@@ -25,39 +29,50 @@ if ($format =~ 'json') {
        $r->content_type($ctype or $format);
        $output= sub { print to_json({
                success => 1,
-               show => encode_entities($canontext),
-       })};
+               show => length $canontext ? encode_entities($canontext)
+                       : '&nbsp;',
+               })};
        $output_wrong= sub { print to_json({
                success => 0,
-               show => encode_entities($_[0]),
-       })};
-}              
+               show => $_[0],
+               })};
+}
+if ($format =~ 'return') {
+       $output= sub { return { Error => '', Results => \@results }; };
+       $output_wrong= sub { return { Error => $_[0] }; };
+}
 
 foreach my $each (split m#[/|,]#, $string) {
        $each =~ s/^\s*//;  $each =~ s/\s*$//;  $each =~ s/\s+/ /g;
        next if !length $each;
-       my $pat= "\%$each\%";
-       my $nrows= $sth->execute($pat,$pat);
        my $err= sub {
                my $msg= sprintf $_[0], encode_entities($each);
                $output_wrong->($msg);
-               $m->abort();
        };
-       my $results= $sth->fetchall_arrayref();
-       if (!@$results) {
-               $err->('no island or arch matches "%s"');
-       } elsif (@$results > 3) {
-               $err->('');
-       } elsif (@$results > 1) {
-               my @m= map { $_->[2] } @$results;
-               $err->('ambiguous island or arch "%s", could be '.
-                       join(', ', @m));
+       my %m;
+       my $results;
+       foreach my $pat ("$each\%", "\%$each\%") {
+               $sth->execute($pat,$pat);
+               $results= $sth->fetchall_arrayref();
+               last if @$results==1;
+               map { $m{ $_->[2] }=1 } @$results;
+               $results= undef;
+       }
+       if (!$results) {
+               if (!%m) {
+                       return $err->('no island or arch matches "%s"');
+               } elsif (%m > 5) {
+                       return $err->('&nbsp;');
+               } else {
+                       return $err->('ambiguous island or arch "%s",'.
+                               ' could be '.join(', ', sort keys %m));
+               }
        }
        push @results, $results->[0];
 }
 
-$canontext= join ' | ', map { encode_entities($_->[2]) } @results;
+$canontext= join ' | ', map { $_->[2] } @results;
 
-$output->();
+return $output->();
 
 </%perl>