X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fweb%2Flookup;h=b99cf0ae32f90c5b1d8060d68e44b35b32781084;hb=43454422b2df5e0dcfe144fcb871a2b6f9c1a3d0;hp=3fd854f99d253d7c22d8f9431acc657b42caf8db;hpb=70f23c42b325a1463fe8a9d76cb967b7df1260df;p=ypp-sc-tools.db-test.git
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 3fd854f..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 => '',
@@ -76,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,
});
@@ -118,14 +129,15 @@ $ours
% }
%method>
-
<% ucfirst $ahtml{Query} %> - YARRG
+<% ucfirst $ahtml{Query} %> - YARRG
<&| script &>
function register_onload(f) {
@@ -138,11 +150,11 @@ tr.datarow1 { background: #e3e3e3; }
&script>
-YARRG -
- Yet Another Revenue Research Gatherer
-|
-documentation
+% if (!printable($m)) {
+
+<& navbar &>
+% }
<%perl>
foreach my $var (@vars) {
@@ -153,7 +165,9 @@ foreach my $var (@vars) {
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?: (?:route|commod|capacity)string |
+ m/^(?: (?:route|commod|capacity|capital|minprofit
+ |island)string |
+ lossperleague | distance |
commodid |
islandid \d |
archipelago \d |
@@ -173,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};
@@ -180,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) {
@@ -189,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;
%perl>
@@ -196,6 +212,7 @@ my $prselector_core= sub {
$after= '';
}
print $html, $after;
+ print " ", $finally if defined $finally;
$cvalix++;
}
print "
\n\n";
@@ -238,10 +255,14 @@ my $someresults= sub {
$debug => 0
%args>
+% 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 {
@@ -253,15 +274,14 @@ $debug => 0
}
&>
-
-
%#---------- debugging and epilogue ----------
% if ($debug) {
-
+
% }
<&| script &>