X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=64860fd5f9db94e83105e83b50ad43e433b286db;hb=9d01242d0991d15f7ea84454264c868e1c4ed8ad;hp=1bd8c79279be4315cce57d2dbfd9e8ab78469a88;hpb=796f9c172398b390fb4a0fc3e72b51a58a95a69f;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 1bd8c79..64860fd 100755
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -35,9 +35,9 @@
<%perl>
-my %a;
my %ahtml;
my @vars;
+my %styles;
#---------- "mode" argument parsing and mode menu at top of page ----------
@@ -56,6 +56,7 @@ my @vars;
}, { Name => 'Query',
Before => 'Query: ',
Values => [ [ 'route', 'Trades for route' ],
+ [ 'commod', 'Prices for commodity' ],
[ 'age', 'Data age' ] ]
});
@@ -69,16 +70,34 @@ 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];
}
}
+
+<%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};
+ value="<% $v |h %>">
+% }
+
+
<% ucfirst $ahtml{Query} %> - YARRG
YARRG -
@@ -88,17 +107,15 @@ foreach my $var (@vars) {
<%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)string|islandid\d|archipelago\d|debug)$/;
my $val= $ARGS{$var};
next if $val eq 'none';
$queryqf{$var}= $val;
@@ -114,7 +131,7 @@ foreach my $var (@vars) {
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";
@@ -141,9 +158,9 @@ foreach my $var (@vars) {
#---------- initial checks, startup, main entry form ----------
-die if $a{Query} =~ m/[^a-z]/;
+die if $styles{Query} =~ m/[^a-z]/;
-dbw_connect($a{Ocean});
+dbw_connect($styles{Ocean});
<%args>
@@ -152,7 +169,9 @@ $debug => 0
-<& "query_$a{Query}", %baseqf, %queryqf, quri => $quri, a => \%a &>
+<& "query_$styles{Query}", %baseqf, %queryqf, %styles, quri => $quri &>
+
+
%#---------- debugging and epilogue ----------