X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=a2ccc8de0a80df6b3659fafc95bdc41976888deb;hp=a56adf7a2e7d8ee2b45e047ba30d85c92e72f017;hb=f7c3c04f684b0e9cac4518beeece11853ef75109;hpb=fd6bf359d9051fe0c6d269a44bcc08cc53aa2fea
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index a56adf7..a2ccc8d 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,22 @@ 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' ],
+ ],
+ 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 +126,37 @@ $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();
+ };
+ }
+
+
+% if (!printable($m)) {
YARRG -
Yet Another Revenue Research Gatherer
|
+introduction
+|
documentation
+|
+development
+% }
<%perl>
foreach my $var (@vars) {
@@ -129,7 +167,14 @@ 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|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 +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};
@@ -198,7 +244,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 +254,12 @@ my $someresults= sub {
$debug => 0
+% if (!printable($m)) {
+% }
<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
- quri => $quri, dbh => $dbh,
+ quri => $quri, dbh => $dbh, queryqf => \%queryqf, allargs => \%ARGS,
prselector => $prselector,
someresults => $someresults,
emsgokorprint => sub {