AJAX route validator for text strings

diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm
index 96dde357c9bb40c31d3f7b399848ce9002d1167e..377d97b1c5c8e9794df7917e1bfb0cb3a6680a66 100644 (file)
--- a/yarrg/CommodsWeb.pm
+++ b/yarrg/CommodsWeb.pm
@@ -36,6 +36,7 @@ use Commods;
 use CommodsDatabase;
 
 our $self_url;
+our $base_url;
 
 BEGIN {
     use Exporter ();
@@ -43,7 +44,7 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw($dbh &db_setocean &db_connect &db_doall
-                     $self_url);
+                     $self_url $base_url);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
@@ -57,5 +58,6 @@ for my $dir (@INC) {
 }
 
 $self_url= 'http://'.$ENV{'SERVER_NAME'}.$ENV{'SCRIPT_NAME'}.$ENV{'PATH_INFO'};
+$base_url= $self_url;  $base_url =~ s,/[^/]+,,;
 
 1;

diff --git a/yarrg/web/pirate-route b/yarrg/web/pirate-route
index 42de303d16caf9bc960077596de6be4ba38d709c..f58d47c20f450041eb39d2b13ee3d8784b4f1442 100644 (file)
--- a/yarrg/web/pirate-route
+++ b/yarrg/web/pirate-route
@@ -66,7 +66,7 @@ foreach my $var (@vars) {
        print '<p>';
 }
 
-db_setocean($a{'ocean'});
+db_setocean($a{Ocean});
 db_connect();
 
 </%perl>
@@ -76,9 +76,12 @@ db_connect();
 
 % if (!$a{Dropdowns}) {
 Enter route (islands, or archipelagoes, separated by commas;
- abbreviations are OK):<br>
+ abbreviations are OK):<br/>
 
 <script type="text/javascript">
+textRoute_uri= "routetextstring?format=json"
+               + "&ocean=<% uri_escape($a{Ocean}) %>";
+
 textRoute_timeout=false;
 textRoute_request=false;
 textRoute_done='';
@@ -95,19 +98,32 @@ function textRoute_Needed(){
   textRoute_Request();
 }
 function textRoute_Request(){
-  if (textRoute_request || textRoute_needed==textRoute_done) {
-    alert('unneeded');
-    return;
-  }
+  if (textRoute_request || textRoute_needed==textRoute_done) return;
   textRoute_done= textRoute_needed;
-  alert(String.concat('needed! ',textRoute_done));
+  textRoute_request= new XMLHttpRequest();
+  uri= textRoute_uri+'&string='+encodeURIComponent(textRoute_needed);
+  textRoute_request.open('GET', uri);
+  textRoute_request.onreadystatechange= textRoute_Ready;
+  textRoute_request.send(null);
+}
+function textRoute_Ready() {
+  if (textRoute_request.readyState != 4) return;
+  if (textRoute_request.status == 200) {
+    response= textRoute_request.responseText;
+    //alert('got [[ '+response+' ]]');
+    eval('results='+response);
+    toedit= document.getElementsByName('routeresults').item(0);
+    toedit.innerHTML= results['show'];
+  }
+  textRoute_request= false;
+  textRoute_Request();
 }
 </script>
 
 <input type="text" name="routestring" size=80
  onchange="textRoute_element= event.currentTarget; textRoute_Needed();"
  onkeydown="textRoute_element= event.currentTarget; textRoute_Later();"><br>
-<div name="results"></div></br>
+<div name="routeresults"></div><br/>
 
 % } else {
 
@@ -132,9 +148,9 @@ while ($row=$sth->fetchrow_arrayref) {
 <option name="none">Select island...</option>
 <% $islandlistdata %></select></td>
 %      }
-% }
 </tr>
 </table>
+% }
 
 <input type=submit name=submit value="Go">
 </form>
@@ -142,5 +158,6 @@ while ($row=$sth->fetchrow_arrayref) {
 <%init>
 use CommodsWeb;
 use HTML::Entities;
+use URI::Escape;
 
 </%init>

diff --git a/yarrg/web/routetextstring b/yarrg/web/routetextstring
new file mode 100644 (file)
index 0000000..0e4ae6e
--- /dev/null
+++ b/yarrg/web/routetextstring
@@ -0,0 +1,63 @@
+<%args>
+$ocean
+$format
+$ctype => undef
+$string
+</%args>
+<%perl>
+
+use CommodsWeb;
+use HTML::Entities;
+use JSON;
+
+db_setocean($ocean);
+db_connect();
+
+my $sth= $dbh->prepare("SELECT archipelago,islandid,islandname
+                               FROM islands WHERE islandname LIKE ?
+       UNION ALL       SELECT DISTINCT archipelago,NULL,archipelago
+                               FROM islands WHERE archipelago LIKE ?");
+
+my (@results, $canontext);
+my ($output, $output_wrong);
+
+if ($format =~ 'json') {
+       $r->content_type($ctype or $format);
+       $output= sub { print to_json({
+               success => 1,
+               show => encode_entities($canontext),
+       })};
+       $output_wrong= sub { print to_json({
+               success => 0,
+               show => encode_entities($_[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));
+       }
+       push @results, $results->[0];
+}
+
+$canontext= join ' | ', map { encode_entities($_->[2]) } @results;
+
+$output->();
+
+</%perl>