X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;ds=sidebyside;f=yarrg%2Fweb%2Flookup;h=15c52067f45cfeb40d090a8c86e63903f9d83ff2;hb=ea3cffe854b1c540bc68cd2218fdb2be732197fa;hp=15f341adc3cf8131fc41ae91b8ebd16abc450af2;hpb=b003b70daab49984677a1cfadced9da9ee9be19a;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 15f341a..15c5206 100755
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -78,6 +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,
});
@@ -122,12 +132,13 @@ $ours
<% ucfirst $ahtml{Query} %> - YARRG
<&| script &>
function register_onload(f) {
@@ -140,15 +151,11 @@ tr.datarow1 { background: #ffffff; }
&script>
-YARRG -
- Yet Another Revenue Research Gatherer
-|
-introduction
-|
-documentation
-|
-development
+% if (!printable($m)) {
+
+<& navbar &>
+% }
<%perl>
foreach my $var (@vars) {
@@ -159,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 |
@@ -180,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};
@@ -187,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) {
@@ -196,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;
%perl>
@@ -203,6 +213,7 @@ my $prselector_core= sub {
$after= '';
}
print $html, $after;
+ print " ", $finally if defined $finally;
$cvalix++;
}
print "
\n\n";
@@ -245,10 +256,14 @@ my $someresults= sub {
$debug => 0
%args>
+% if (!printable($m)) {
+
+% }
<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
- quri => $quri, dbh => $dbh, queryqf => \%queryqf,
+ quri => $quri, dbh => $dbh,
+ baseqf => \%baseqf, queryqf => \%queryqf, allargs => \%ARGS,
prselector => $prselector,
someresults => $someresults,
emsgokorprint => sub {
@@ -260,15 +275,14 @@ $debug => 0
}
&>
-
-
%#---------- debugging and epilogue ----------
% if ($debug) {
-
+
% }
<&| script &>