X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=fd66f1a7b8ae8c3b1617b255a8309a244370407d;hp=7af431cee119f6e163439b83a08fcf84b6b8eedd;hb=c98eb3b0720f8194a116aea338fd2d3caa8c7538;hpb=8c1110db34ac870015cb7edb6e5bba6ca1f2d90d diff --git a/yarrg/web/lookup b/yarrg/web/lookup index 7af431c..fd66f1a 100755 --- a/yarrg/web/lookup +++ b/yarrg/web/lookup @@ -58,6 +58,7 @@ my %styles; Values => [ [ 'route', 'Trades for route' ], [ 'commod', 'Prices for commodity' ], [ 'offers', 'Offers at location' ], + [ 'routesearch', 'Find profitable route' ], [ 'age', 'Data age' ] ] }, { Name => 'BuySell', Before => '', @@ -77,6 +78,15 @@ 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' ], ], QuerySpecific => 1, }); @@ -121,12 +131,13 @@ $ours <% ucfirst $ahtml{Query} %> - YARRG <&| script &> function register_onload(f) { @@ -139,15 +150,11 @@ tr.datarow1 { background: #ffffff; } -YARRG - - Yet Another Revenue Research Gatherer -| -introduction -| -documentation -| -development +% if (!printable($m)) { +
+<& navbar &>

+% } <%perl> foreach my $var (@vars) { @@ -158,8 +165,8 @@ foreach my $var (@vars) { foreach my $var (keys %ARGS) { next unless $var =~ - m/^(?: (?:route|commod|capacity|capital)string | - lossperleague | + m/^(?: (?:route|commod|capacity|capital|island)string | + lossperleague | distance | commodid | islandid \d | archipelago \d | @@ -179,6 +186,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}; @@ -186,7 +194,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) { @@ -195,6 +203,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; @@ -202,6 +211,7 @@ my $prselector_core= sub { $after= ''; } print $html, $after; + print " ", $finally if defined $finally; $cvalix++; } print "

\n\n"; @@ -244,10 +254,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 { @@ -259,15 +273,14 @@ $debug => 0 } &> -

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

+

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