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=a56adf7a2e7d8ee2b45e047ba30d85c92e72f017;hb=43454422b2df5e0dcfe144fcb871a2b6f9c1a3d0;hpb=fceed60843f6a7c037b908eb529b542ad263c500 diff --git a/yarrg/web/lookup b/yarrg/web/lookup index a56adf7..b99cf0a 100755 --- 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 => '', @@ -68,10 +70,25 @@ my %styles; QuerySpecific => 1, }, { Name => 'ShowBlank', Before => '', - Values => [ [ 'omit', 'Omit islands with no offers' ], + Values => [ [ 0, 'Omit islands with no offers' ], [ 'show', 'Show all islands' ], ], QuerySpecific => 1, + }, { Name => 'ShowStalls', + 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' ], + ], + QuerySpecific => 1, }); foreach my $var (@vars) { @@ -112,13 +129,32 @@ $ours % } -<% ucfirst $ahtml{Query} %> - YARRG +<% ucfirst $ahtml{Query} %> - YARRG + +<&| script &> + function register_onload(f) { + var previous_onload= window.onload; + window.onload= function() { + if (previous_onload) previous_onload(); + f(); + }; + } + + -YARRG - - Yet Another Revenue Research Gatherer -| -documentation +% if (!printable($m)) { +
+<& navbar &>

+% } <%perl> foreach my $var (@vars) { @@ -129,7 +165,15 @@ foreach my $var (@vars) { foreach my $var (keys %ARGS) { next unless $var =~ - m/^(?:(?:route|commod)string|islandid\d|archipelago\d|debug)$/; + m/^(?: (?:route|commod|capacity|capital|minprofit + |island)string | + lossperleague | distance | + commodid | + islandid \d | + archipelago \d | + debug | + [RT]\w+ + )$/x; my $val= $ARGS{$var}; next if $val eq 'none'; $queryqf{$var}= $val; @@ -143,6 +187,7 @@ my $quri= sub { my $prselector_core= sub { my ($var)= @_; + return if printable($m); my $name= $var->{Name}; my $lname= lc $var->{Name}; my $delim= $var->{Before}; @@ -150,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) { @@ -159,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; @@ -166,6 +212,7 @@ my $prselector_core= sub { $after= ''; } print $html, $after; + print " ", $finally if defined $finally; $cvalix++; } print "

\n\n"; @@ -198,7 +245,9 @@ my $results_head_done=0; my $someresults= sub { return if $results_head_done; $results_head_done=1; - print "\n

Results

\n"; + my ($h)= @_; + $h= 'Results' if !$h; + print "\n

$h

\n"; }; @@ -206,10 +255,14 @@ my $someresults= sub { $debug => 0 +% if (!printable($m)) { +
+% } <& "query_$styles{Query}", %baseqf, %queryqf, %styles, quri => $quri, dbh => $dbh, + baseqf => \%baseqf, queryqf => \%queryqf, allargs => \%ARGS, prselector => $prselector, someresults => $someresults, emsgokorprint => sub { @@ -221,15 +274,14 @@ $debug => 0 } &> -

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

+

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