X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=a118de0905a4d1e58cd500fcc732b20811f847ef;hb=b6d8c4a781c0bedf79a4b13af5afe9ad47de97ed;hp=5a441b31b652e874e4d5c04f1dd9f7cc31dbf369;hpb=ea35c3e59168d937ba97e9e76b79918936fbaa6d;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 5a441b3..a118de0 100755
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -35,14 +35,9 @@
%doc>
<%perl>
-my %a;
my %ahtml;
my @vars;
-
-# for output:
-my @archipelagoes;
-my @islandids;
-my %islandid2;
+my %styleqf;
#---------- "mode" argument parsing and mode menu at top of page ----------
@@ -61,6 +56,7 @@ my %islandid2;
}, { Name => 'Query',
Before => 'Query: ',
Values => [ [ 'route', 'Trades for route' ],
+ [ 'commod', 'Prices for commodity' ],
[ 'age', 'Data age' ] ]
});
@@ -74,18 +70,18 @@ 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} };
+ $styleqf{$name}= $ARGS{$lname};
+ my @html= grep { $_->[0] eq $styleqf{$name} }
+ @{ $var->{Values} };
$ahtml{$name}= @html==1 ? $html[0][1] : '???';
} else {
- $a{$name}= $var->{Values}[0][0];
+ $styleqf{$name}= $var->{Values}[0][0];
$ahtml{$name}= $var->{Values}[0][1];
}
}
%perl>
<% ucfirst $ahtml{Query} %> - YARRG
-<& webcopyright &>
YARRG -
Yet Another Revenue Research Gatherer
@@ -120,7 +116,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}}($styleqf{$name});
my $cvalix= 0;
foreach my $valr (@{ $var->{Values} }) {
print $delim; $delim= "\n|\n";
@@ -147,249 +143,20 @@ foreach my $var (@vars) {
#---------- initial checks, startup, main entry form ----------
-dbw_connect($a{Ocean});
+die if $styleqf{Query} =~ m/[^a-z]/;
+
+dbw_connect($styleqf{Ocean});
%perl>
<%args>
$debug => 0
-$routestring => ''
%args>
-%########### query `route' ##########
-% if ($a{Query} eq 'route') {
-
-Specify route
-
-
-<%perl>
-#========== result computations ==========
-
-my $results_head;
-$results_head= sub {
- print "Results
\n";
- $results_head= sub { };
-};
-
-#---------- 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];
- }
- }
- }
-
-} else { #---------- results - dropdowns ----------
-
-my $argorundef= sub {
- my ($dd,$base) = @_;
- my $thing= $ARGS{"${base}${dd}"};
- $thing= undef if defined $thing and $thing eq 'none';
- return $thing;
-};
-
-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->();
-%perl>
- Specified archipelago <% $arch %> but
- island <% $ii->{Name} %>
- which is in <% $iarch %>; using the island.
-<%perl>
- }
- $arch= undef;
- }
- push @archipelagoes, $arch;
- push @islandids, $island;
-}
-
-}#---------- result processing, common stuff
-%perl>
-
-% if (@islandids) {
-% $results_head->();
-
-<& routetrade, islandids => \@islandids, archipelagoes => \@archipelagoes &>
-
-% }
-
-% } elsif ($a{Query} eq 'age') {
-% ########### query `age' ##########
-
-Market data age
-<& dataage, %baseqf, %queryqf &>
-
-% } ########## end of `age' query ##########
+
%#---------- debugging and epilogue ----------