X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=b99cf0ae32f90c5b1d8060d68e44b35b32781084;hp=a2ccc8de0a80df6b3659fafc95bdc41976888deb;hb=43454422b2df5e0dcfe144fcb871a2b6f9c1a3d0;hpb=f7c3c04f684b0e9cac4518beeece11853ef75109 diff --git a/yarrg/web/lookup b/yarrg/web/lookup index a2ccc8d..b99cf0a 100755 --- a/yarrg/web/lookup +++ b/yarrg/web/lookup @@ -78,6 +78,9 @@ 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', @@ -128,12 +131,13 @@ $ours <% ucfirst $ahtml{Query} %> - YARRG <&| script &> function register_onload(f) { @@ -147,14 +151,8 @@ tr.datarow1 { background: #ffffff; } % if (!printable($m)) { -YARRG - - Yet Another Revenue Research Gatherer -| -introduction -| -documentation -| -development +
+<& navbar &>

% } <%perl> @@ -167,7 +165,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)string | lossperleague | distance | commodid | islandid \d | @@ -196,7 +195,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) { @@ -205,6 +204,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; @@ -212,6 +212,7 @@ my $prselector_core= sub { $after= ''; } print $html, $after; + print " ", $finally if defined $finally; $cvalix++; } print "

\n\n"; @@ -255,11 +256,13 @@ $debug => 0 % if (!printable($m)) { +

% } <& "query_$styles{Query}", %baseqf, %queryqf, %styles, - quri => $quri, dbh => $dbh, queryqf => \%queryqf, allargs => \%ARGS, + quri => $quri, dbh => $dbh, + baseqf => \%baseqf, queryqf => \%queryqf, allargs => \%ARGS, prselector => $prselector, someresults => $someresults, emsgokorprint => sub { @@ -271,15 +274,14 @@ $debug => 0 } &> -

- %#---------- debugging and epilogue ---------- % if ($debug) { -

+

 Debug log:
+
% } <&| script &>