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=931594a2b71ce718d615bbfecf46e09c00c9d5d2;hb=f7c3c04f684b0e9cac4518beeece11853ef75109;hpb=efc8497c2414dfded724d7181e11df53b947e387
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 931594a..a2ccc8d 100755
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -35,14 +35,9 @@
<%perl>
-my %a;
my %ahtml;
my @vars;
-
-# for output:
-my @archipelagoes;
-my @islandids;
-my %islandid2;
+my %styles;
#---------- "mode" argument parsing and mode menu at top of page ----------
@@ -61,7 +56,36 @@ my %islandid2;
}, { Name => 'Query',
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 => '',
+ 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 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) {
@@ -74,36 +98,83 @@ foreach my $var (@vars) {
$val= [ $val, encode_entities($val) ];
}
if (exists $ARGS{$lname}) {
- $a{$name}= $ARGS{$lname};
- my @html= grep { $_->[0] eq $a{$name} } @{ $var->{Values} };
+ $styles{$name}= $ARGS{$lname};
+ my @html= grep { $_->[0] eq $styles{$name} }
+ @{ $var->{Values} };
$ahtml{$name}= @html==1 ? $html[0][1] : '???';
} else {
- $a{$name}= $var->{Values}[0][0];
+ $styles{$name}= $var->{Values}[0][0];
$ahtml{$name}= $var->{Values}[0][1];
}
}
-<% ucfirst $ahtml{Query} %> - YARRG
+<%shared>
+my %baseqf;
+my %queryqf;
+
+
+<%method formhidden>
+<%args>
+$ours
+
+% foreach my $n (keys %baseqf, keys %queryqf) {
+% next if $ours->($n);
+% my $v= exists $baseqf{$n} ? $baseqf{$n} : $queryqf{$n};
+<% 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>
-my %baseqf;
foreach my $var (@vars) {
my $lname= lc $var->{Name};
next unless exists $ARGS{$lname};
$baseqf{$lname}= $ARGS{$lname};
}
-my %queryqf;
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?:routestring|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;
@@ -115,11 +186,13 @@ my $quri= sub {
$uri->path_query();
};
-foreach my $var (@vars) {
+my $prselector_core= sub {
+ my ($var)= @_;
+ return if printable($m);
my $name= $var->{Name};
my $lname= lc $var->{Name};
my $delim= $var->{Before};
- my $canon= &{$var->{CmpCanon}}($a{$name});
+ my $canon= &{$var->{CmpCanon}}($styles{$name});
my $cvalix= 0;
foreach my $valr (@{ $var->{Values} }) {
print $delim; $delim= "\n|\n";
@@ -142,253 +215,63 @@ foreach my $var (@vars) {
$cvalix++;
}
print "
\n\n";
-}
-
-#---------- initial checks, startup, main entry form ----------
-
-dbw_connect($a{Ocean});
-
-
-<%args>
-$debug => 0
-$routestring => ''
-
-
-
Specify route
-
-
-<%perl>
-#========== result computations ==========
-
-my $results_head;
-$results_head= sub {
- print "Results \n";
- $results_head= sub { };
-};
+#---------- initial checks, startup, main entry form ----------
-#---------- result computation - textstring ----------
-if (!$a{Dropdowns}) {
- if (length $routestring) {
- $results_head->();
- my $rsr= $m->comp('routetextstring',
- ocean => $a{Ocean},
- string => $routestring,
- format => 'return'
- );
- if (length $rsr->{Error}) {
- print encode_entities($rsr->{Error});
- } else {
- foreach my $entry (@{ $rsr->{Results} }) {
- push @archipelagoes,
- defined $entry->[1] ? undef : $entry->[0];
- push @islandids, $entry->[1];
- }
- }
- }
+die if $styles{Query} =~ m/[^a-z]/;
-} else { #---------- results - dropdowns ----------
+my $mydbh;
+my $dbh= ($mydbh= dbw_connect($styles{Ocean}));
-my $argorundef= sub {
- my ($dd,$base) = @_;
- my $thing= $ARGS{"${base}${dd}"};
- $thing= undef if defined $thing and $thing eq 'none';
- return $thing;
+my $results_head_done=0;
+my $someresults= sub {
+ return if $results_head_done;
+ $results_head_done=1;
+ my ($h)= @_;
+ $h= 'Results' if !$h;
+ print "\n$h \n";
};
-for my $dd (0..$a{Dropdowns}-1) {
- my $arch= $argorundef->($dd,'archipelago');
- my $island= $argorundef->($dd,'islandid');
- next unless defined $arch or defined $island;
- if (defined $island and defined $arch) {
- my $ii= $islandid2{$island};
- my $iarch= $ii->{Arch};
- if ($iarch ne $arch) {
- $results_head->();
-
- Specified archipelago <% $arch %> but
- island <% $ii->{Name} %>
- which is in <% $iarch %>; using the island.Market data age
-<& dataage, %baseqf, %queryqf &>
+<& "query_$styles{Query}", %baseqf, %queryqf, %styles,
+ quri => $quri, dbh => $dbh, queryqf => \%queryqf, allargs => \%ARGS,
+ prselector => $prselector,
+ someresults => $someresults,
+ emsgokorprint => sub {
+ my ($emsg) = @_;
+ return 1 unless defined $emsg and length $emsg;
+ $someresults->();
+ print $emsg;
+ return 0;
+ }
+ &>
-% } ########## end of `age' query ##########
+
%#---------- debugging and epilogue ----------
@@ -416,3 +299,8 @@ use HTML::Entities;
use URI::Escape;
+<%cleanup>
+
+$mydbh->rollback() if $mydbh;
+
+