X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=15c52067f45cfeb40d090a8c86e63903f9d83ff2;hb=b5cdb0d90df8dde3653e2a1d8d2c3e1c2d04af3e;hp=2f67760c487d6f1281b37bcb819ca6a7b2dd3d01;hpb=a1fb96b672d234f5961a397215c19c2c631c5cc3;p=ypp-sc-tools.db-test.git diff --git a/yarrg/web/lookup b/yarrg/web/lookup index 2f67760..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, }); @@ -128,12 +132,13 @@ $ours <% ucfirst $ahtml{Query} %> - YARRG <&| script &> function register_onload(f) { @@ -146,15 +151,11 @@ tr.datarow1 { background: #ffffff; } -YARRG - - Yet Another Revenue Research Gatherer -| -introduction -| -documentation -| -development +% if (!printable($m)) { +
+<& navbar &>

+% } <%perl> foreach my $var (@vars) { @@ -165,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 | @@ -186,6 +188,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}; @@ -193,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) { @@ -202,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; @@ -209,6 +213,7 @@ my $prselector_core= sub { $after= ''; } print $html, $after; + print " ", $finally if defined $finally; $cvalix++; } print "

\n\n"; @@ -251,10 +256,14 @@ my $someresults= sub { $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 { @@ -266,15 +275,14 @@ $debug => 0 } &> -

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

+

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