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=36c0a27f7f3468311a21cb92883f7d825e34e953;hp=1b85ecc8b9d06b9dc5ba96b14b63e4cac99501c0;hb=fc9092694d98ee3737f8cdceef02d65cc6255dd4;hpb=72587d0d7358ca77ecd0ede859abba7f89b1d9d2
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 1b85ecc..36c0a27 100755
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -58,6 +58,26 @@ my %styles;
Values => [ [ 'route', 'Trades for route' ],
[ 'commod', 'Prices for commodity' ],
[ 'age', 'Data age' ] ]
+ }, { Name => 'BuySell',
+ Before => '',
+ Values => [ [ 'buy_sell', 'Buy and sell' ],
+ [ 'sell_buy', 'Sell and buy' ],
+ [ 'buy', 'Buy offers only' ],
+ [ 'sell', 'Sell offers only' ],
+ ],
+ QuerySpecific => 1,
+ }, { Name => 'ShowBlank',
+ Before => '',
+ Values => [ [ 0, 'Omit islands with no offers' ],
+ [ 'show', 'Show all islands' ],
+ ],
+ QuerySpecific => 1,
+ }, { Name => 'ShowStalls',
+ Before => '',
+ Values => [ [ 0, 'Show amount at each price' ],
+ [ 1, 'Show individual stalls' ],
+ ],
+ QuerySpecific => 1,
});
foreach my $var (@vars) {
@@ -98,7 +118,16 @@ $ours
% }
-<% ucfirst $ahtml{Query} %> - YARRG
+<% ucfirst $ahtml{Query} %> - YARRG
+
+
YARRG -
Yet Another Revenue Research Gatherer
@@ -115,7 +144,12 @@ foreach my $var (@vars) {
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?:(?:route|commod)string|islandid\d|archipelago\d|debug)$/;
+ m/^(?: (?:route|commod)string |
+ islandid \d |
+ archipelago \d |
+ debug |
+ [RT]\w+
+ )$/x;
my $val= $ARGS{$var};
next if $val eq 'none';
$queryqf{$var}= $val;
@@ -127,7 +161,8 @@ my $quri= sub {
$uri->path_query();
};
-foreach my $var (@vars) {
+my $prselector_core= sub {
+ my ($var)= @_;
my $name= $var->{Name};
my $lname= lc $var->{Name};
my $delim= $var->{Before};
@@ -154,19 +189,38 @@ foreach my $var (@vars) {
$cvalix++;
}
print "\n\n";
+};
+
+my $prselector= sub {
+ my ($name)= @_;
+ foreach my $var (@vars) {
+ if ($var->{Name} eq $name) {
+ $prselector_core->($var);
+ return;
+ }
+ }
+ die $name;
+};
+
+foreach my $var (@vars) {
+ next if $var->{QuerySpecific};
+ $prselector_core->($var);
}
#---------- initial checks, startup, main entry form ----------
die if $styles{Query} =~ m/[^a-z]/;
-dbw_connect($styles{Ocean});
+my $mydbh;
+my $dbh= ($mydbh= dbw_connect($styles{Ocean}));
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";
};
@@ -176,7 +230,9 @@ $debug => 0
-<& "query_$styles{Query}", %baseqf, %queryqf, %styles, quri => $quri,
+<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
+ quri => $quri, dbh => $dbh,
+ prselector => $prselector,
someresults => $someresults,
emsgokorprint => sub {
my ($emsg) = @_;
@@ -215,3 +271,8 @@ use HTML::Entities;
use URI::Escape;
+<%cleanup>
+
+$mydbh->rollback() if $mydbh;
+
+