where-vessels: subclass smasher works; need to reorg to be a grid like Show

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

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index eb9f53d815d9825ff56b265bac60c5b766507e31..15c52067f45cfeb40d090a8c86e63903f9d83ff2 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -78,12 +78,16 @@ my %styles;
                Before => '',
                Values => [     [ 0, 'Show total quantity at each price' ],
                                [ 1, 'Show individual stalls' ],
+                               [ 2, "Also be cautious about stalls'".
+                                       " poe reserves",
+                                       '<a href="docs#poelimit">[?]</a>' ]
                        ],
                QuerySpecific => 1,
        }, {    Name => 'RouteSearchType',
                Before => 'Type of routes to search for: ',
                Values => [     [ 0, 'Open-ended' ],
                                [ 1, 'Circular' ],
+                               [ 2, 'Specific destination' ],
                        ],
                QuerySpecific => 1,
        });
@@ -133,8 +137,8 @@ $ours
   div.query { background: #d7d8b3; padding: 1em; }
   div.results { padding: 1em; }
   table.data { background: #b5b686; }
-  tr.datarow0 { background: #e3e3e3; }
-  tr.datarow1 { background: #ffffff; }
+  tr.datarow0 { background: #ffffff; }
+  tr.datarow1 { background: #e3e3e3; }
 </style>
 <&| script &>
   function register_onload(f) {
@@ -162,7 +166,8 @@ foreach my $var (@vars) {
 
 foreach my $var (keys %ARGS) {
        next unless $var =~
-               m/^(?: (?:route|commod|capacity|capital|island)string |
+               m/^(?: (?:route|commod|capacity|capital|minprofit
+                        |island|dest)string |
                        lossperleague | distance |
                        commodid |
                        islandid \d |
@@ -191,7 +196,7 @@ my $prselector_core= sub {
        my $cvalix= 0;
        foreach my $valr (@{ $var->{Values} }) {
                print $delim;  $delim= "\n|\n";
-               my ($value,$html) = @$valr;
+               my ($value,$html,$finally) = @$valr;
                my $iscurrent= &{$var->{CmpCanon}}($value) eq $canon;
                my $after;
                if ($iscurrent) {
@@ -200,6 +205,7 @@ my $prselector_core= sub {
                } else {
                        my %qf= (%baseqf,%queryqf);
                        delete $qf{$lname};
+                       delete $qf{$_} foreach grep { m/^[A-Z]/ } keys %qf;
                        $qf{$lname}= $value if $cvalix;
 </%perl>
 <a href="<% $quri->(%qf) |h %>">
@@ -207,6 +213,7 @@ my $prselector_core= sub {
                        $after= '</a>';
                }
                print $html, $after;
+               print " ", $finally if defined $finally;
                $cvalix++;
        }
        print "<p>\n\n";