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=a2ccc8de0a80df6b3659fafc95bdc41976888deb;hp=3fd854f99d253d7c22d8f9431acc657b42caf8db;hb=3ce667a2d3fd7c36f60da86bb59071264790e375;hpb=70f23c42b325a1463fe8a9d76cb967b7df1260df
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 3fd854f..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 => '',
@@ -78,6 +80,12 @@ my %styles;
[ 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) {
@@ -118,14 +126,14 @@ $ours
% }
-<% ucfirst $ahtml{Query} %> - YARRG
+<% ucfirst $ahtml{Query} %> - YARRG
<&| script &>
function register_onload(f) {
@@ -138,11 +146,17 @@ tr.datarow1 { background: #e3e3e3; }
+% if (!printable($m)) {
YARRG -
Yet Another Revenue Research Gatherer
|
+introduction
+|
documentation
+|
+development
+% }
<%perl>
foreach my $var (@vars) {
@@ -153,7 +167,8 @@ foreach my $var (@vars) {
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?: (?:route|commod|capacity)string |
+ m/^(?: (?:route|commod|capacity|capital|island)string |
+ lossperleague | distance |
commodid |
islandid \d |
archipelago \d |
@@ -173,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};
@@ -238,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 {