routesearch: support circular routes

[ypp-sc-tools.db-live.git] / yarrg / web / lookup
diff --git a/yarrg/web/lookup b/yarrg/web/lookup

index 448ad6ec3441d38171735cbcbb0546b9a235ed0c..2f67760c487d6f1281b37bcb819ca6a7b2dd3d01 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -57,6 +57,8 @@ my %styles;
                 Before => 'Query: ',
                 Values => [     [ 'route', 'Trades for route' ],
                                 [ 'commod', 'Prices for commodity' ],
+                               [ 'offers', 'Offers at location' ],
+                               [ 'routesearch', 'Find profitable route' ],
                                 [ 'age', 'Data age' ] ]
         }, {    Name => 'BuySell',
                 Before => '',
@@ -78,6 +80,12 @@ my %styles;
                                 [ 1, 'Show individual stalls' ],
                         ],
                 QuerySpecific => 1,
+       }, {    Name => 'RouteSearchType',
+               Before => 'Type of routes to search for: ',
+               Values => [     [ 0, 'Open-ended' ],
+                               [ 1, 'Circular' ],
+                       ],
+               QuerySpecific => 1,
         });
  
  foreach my $var (@vars) {
@@ -118,7 +126,7 @@ $ours
  % }
  </%method>
  
-<html><head><title><% ucfirst $ahtml{Query} %> - YARRG</title>
+<html lang="en"><head><title><% ucfirst $ahtml{Query} %> - YARRG</title>
  <style type="text/css">
  body {
    color: #000000;
@@ -144,6 +152,8 @@ tr.datarow1 { background: #ffffff; }
  <a href="intro">introduction</a>
  |
  <a href="docs">documentation</a>
+|
+<a href="devel">development</a>
  <p>
  <%perl>
  
@@ -155,8 +165,8 @@ foreach my $var (@vars) {
  
  foreach my $var (keys %ARGS) {
         next unless $var =~
-               m/^(?: (?:route|commod|capacity)string |
-                       lossperleague |
+               m/^(?: (?:route|commod|capacity|capital|island)string |
+                       lossperleague | distance |
                         commodid |
                         islandid \d |
                         archipelago \d |
@@ -244,7 +254,7 @@ $debug => 0
  <hr>
  
  <& "query_$styles{Query}", %baseqf, %queryqf, %styles,
-    quri => $quri, dbh => $dbh,
+    quri => $quri, dbh => $dbh, queryqf => \%queryqf, allargs => \%ARGS,
      prselector => $prselector,
      someresults => $someresults,
      emsgokorprint => sub {