WIP routesearch: add new UI; make enter_route capable of rejecting arches, etc

diff --git a/yarrg/web/check_islandstring b/yarrg/web/check_islandstring
new file mode 100644 (file)
index 0000000..e8664d5
--- /dev/null
+++ b/yarrg/web/check_islandstring
@@ -0,0 +1,58 @@
+<%doc>
+
+ This is part of the YARRG website.  YARRG is a tool and website
+ for assisting players of Yohoho Puzzle Pirates.
+
+ Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ Copyright (C) 2009 Clare Boothby
+
+  YARRG's client code etc. is covered by the ordinary GNU GPL (v3 or later).
+  The YARRG website is covered by the GNU Affero GPL v3 or later, which
+   basically means that every installation of the website will let you
+   download the source.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ are used without permission.  This program is not endorsed or
+ sponsored by Three Rings.
+
+
+ This Mason component simply defines how to look up island names.
+ It is called by qtextstring.
+
+</%doc>
+
+<%attr>
+multiple => 1
+maxambig => 5
+</%attr>
+
+<%method sqlstmt>
+               SELECT islandname,islandid,NULL
+                       FROM islands WHERE islandname LIKE ?
+</%method>
+
+<%method nomatch>
+  no island matches "<% $ARGS{spec} |h %>"
+</%method>
+
+<%method ambiguous>
+  ambiguous island "<% $ARGS{spec} |h %>",
+  could be <% $ARGS{couldbe} |h %>
+</%method>
+
+<%method manyambig>
+  &nbsp;
+</%method>

diff --git a/yarrg/web/enter_advrouteopts b/yarrg/web/enter_advrouteopts
index 1e037330197161c5ede0342057fc08f31b780c76..2a5eff0e5c5c677334ec055b709d1c566cfdb4f6 100644 (file)
--- a/yarrg/web/enter_advrouteopts
+++ b/yarrg/web/enter_advrouteopts
@@ -88,4 +88,6 @@ Expected losses:
  size=9
 </&>
 
+<% $m->content %>
+
 </table>

diff --git a/yarrg/web/enter_route b/yarrg/web/enter_route
index c21d967de469d24d8b32b2aa4363d66fb2824e5b..fbdf2dc67d89670a48739d968b54b5ccd4c0bf1e 100644 (file)
--- a/yarrg/web/enter_route
+++ b/yarrg/web/enter_route
@@ -48,16 +48,23 @@ $archipelagoes_r
 %#---------- textbox, user enters route as string ----------
 % if (!$qa->{Dropdowns}) {
 
-<% $enterwhat %> (islands, or archipelagoes, separated by |s or commas;
- abbreviations are OK):<br>
+<% $enterwhat %>
+% if (defined($archipelagoes_r)) {
+(islands, or archipelagoes,
+% } else {
+(islands
+% }
+separated by |s or commas; abbreviations are OK):<br>
 
 <&| qtextstring, qa => $qa, dbh => $dbh, emsgstore => $emsg_r,
-    thingstring => 'routestring', prefix => 'rl',
+    thingstring => defined($archipelagoes_r) ? 'routestring' : 'islandstring',
+    prefix => 'rl',
     onresults => sub {
        foreach (@_) {
        my ($canonname, $island, $arch) = @$_;
                push @$islandids_r, $island;
-               push @$archipelagoes_r, defined $island ? undef : $arch;
+               push @$archipelagoes_r, defined $island ? undef : $arch
+                       if defined $archipelagoes_r;
        }
     }
  &>

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 7af431cee119f6e163439b83a08fcf84b6b8eedd..93e44d4455df1cb89043dca178c22525c4239095 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -58,6 +58,7 @@ my %styles;
                Values => [     [ 'route', 'Trades for route' ],
                                [ 'commod', 'Prices for commodity' ],
                                [ 'offers', 'Offers at location' ],
+                               [ 'routesearch', 'Find profitable route' ],
                                [ 'age', 'Data age' ] ]
        }, {    Name => 'BuySell',
                Before => '',

diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 53167aca883f43943d06b3acdd543dabe3ad7ac7..7871c3d54dbb6eed20e97fcfcfb99fb86a127610 100644 (file)
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -50,9 +50,6 @@ my $emsg;
 my @warningfs;
 my @archipelagoes;
 my @islandids;
-my ($max_volume, $max_mass);
-my $lossperleaguepct;
-my $capital;
 
 my $qa= \%ARGS;
 

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
new file mode 100644 (file)
index 0000000..53128f6
--- /dev/null
+++ b/yarrg/web/query_routesearch
@@ -0,0 +1,78 @@
+<%doc>
+
+ This is part of the YARRG website.  YARRG is a tool and website
+ for assisting players of Yohoho Puzzle Pirates.
+
+ Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ Copyright (C) 2009 Clare Boothby
+
+  YARRG's client code etc. is covered by the ordinary GNU GPL (v3 or later).
+  The YARRG website is covered by the GNU Affero GPL v3 or later, which
+   basically means that every installation of the website will let you
+   download the source.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ are used without permission.  This program is not endorsed or
+ sponsored by Three Rings.
+
+
+ This Mason component generates the core of the `routesearch' query.
+
+
+</%doc>
+<%args>
+$quri
+$dbh
+$capacitystring => '';
+$lossperleague => '';
+$capitalstring => '';
+$emsgokorprint
+</%args>
+
+<%perl>
+my $emsg;
+my @warningfs;
+my @islandids;
+
+my $qa= \%ARGS;
+my $routeparams= { EmsgRef => \$emsg };
+my $maxdist;
+</%perl>
+
+<h1>Find most profitable routes and trades</h1>
+
+% if ($qa->{Dropdowns}) {
+This feature is not available from the "drop down menus" interface.
+% } else {
+
+<form action="<% $quri->() |h %>" method="get">
+
+<& enter_route, qa=>$qa, dbh=>$dbh, emsg_r=>\$emsg, warningfs_r=>\@warningfs,
+       enterwhat => 'Enter starting point(s)',
+       islandids_r => \@islandids, archipelagoes_r => undef
+ &>
+
+<&| enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
+<td>
+ Something:
+ <&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ml',
+    thingstring => 'capitalstring', emsgstore => \$emsg,
+    onresults => sub { ($maxdist)= @_; } &>
+ </&>
+</&>
+
+
+% }