X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=15c52067f45cfeb40d090a8c86e63903f9d83ff2;hb=f62749dec2d8b67a9b4b4a910e1159907654d426;hp=6fc1cd76e0cafa0d93da1ce9c8d3037f1254616b;hpb=eb4dd353926d8d5f38ea442ee172ce0b2bb5925e;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 6fc1cd7..15c5206 100755
--- 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",
+ '[?]' ]
],
QuerySpecific => 1,
}, { Name => 'RouteSearchType',
Before => 'Type of routes to search for: ',
Values => [ [ 0, 'Open-ended' ],
[ 1, 'Circular' ],
+ [ 2, 'Specific destination' ],
],
QuerySpecific => 1,
});
@@ -129,12 +133,12 @@ $ours
<% ucfirst $ahtml{Query} %> - YARRG
<&| 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>
@@ -207,6 +213,7 @@ my $prselector_core= sub {
$after= '';
}
print $html, $after;
+ print " ", $finally if defined $finally;
$cvalix++;
}
print "\n\n";