Fix new textstring indirection

diff --git a/yarrg/web/qtextstringcheck b/yarrg/web/qtextstringcheck
index 41960188fa6b896b32d9d286e569131e8cfb1c99..40184558d0662fb073645c291fc46af95bf12ab3 100644 (file)
--- a/yarrg/web/qtextstringcheck
+++ b/yarrg/web/qtextstringcheck
@@ -59,12 +59,6 @@ if ($format =~ /json/) {
        };
        print to_json_shim($jobj);
 }
        };
        print to_json_shim($jobj);
 }

-if ($format =~ /return/) {
-       return {
-               Error => $emsg,
-               Results => length $emsg ? $results : undef
-       };
-}

 if ($format =~ /dump/) {
        $r->content_type('text/plain');
        print Dumper($emsg, $canontext, $results);
 if ($format =~ /dump/) {
        $r->content_type('text/plain');
        print Dumper($emsg, $canontext, $results);

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index b91e55c461bf6e53bf4749ed79a9e6a83bd16960..dc1ebc9917608eaf7a596e7d3eaf95e58165676a 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -168,15 +168,15 @@ $results_head= sub {
 if (!$qa->{Dropdowns}) {
   if (length $routestring) {
        $results_head->();
 if (!$qa->{Dropdowns}) {
   if (length $routestring) {
        $results_head->();

-       my $rsr= $m->comp('routetextstring',
+       my ($emsg,$canonstring,$results)= $m->comp('check_routestring',

                ocean => $qa->{Ocean},
                string => $routestring,
                format => 'return'
        );
                ocean => $qa->{Ocean},
                string => $routestring,
                format => 'return'
        );

-       if (length $rsr->{Error}) {
-               print encode_entities($rsr->{Error});
+       if (length $emsg) {
+               print encode_entities($emsg);

        } else {
        } else {

-               foreach my $entry (@{ $rsr->{Results} }) {
+               foreach my $entry (@$results) {

                        push @archipelagoes,
                                defined $entry->[1] ? undef : $entry->[0];
                        push @islandids, $entry->[1];
                        push @archipelagoes,
                                defined $entry->[1] ? undef : $entry->[0];
                        push @islandids, $entry->[1];