From b511dc5359d8c85c05b4bd3421e9f47a989693ce Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 13 Aug 2009 12:41:21 +0100 Subject: [PATCH] Multiple queries work --- yarrg/web/lookup | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/yarrg/web/lookup b/yarrg/web/lookup index 9c00a65..ae22b33 100644 --- a/yarrg/web/lookup +++ b/yarrg/web/lookup @@ -1,11 +1,6 @@ -Route - YARRG - -YARRG - - Yet Another Revenue Research Gatherer -

- <%perl> my %a; +my %ahtml; my @vars; # for output: @@ -27,6 +22,10 @@ my %islandid2; CmpCanon => sub { !!$_[0] }, Values => [ [ 0, 'Type in names' ], [ 4, 'Select from menus' ] ] + }, { Name => 'Query', + Before => 'Query: ', + Values => [ [ 'route', 'Trades for route' ], + [ 'age', 'Data age' ] ] }); foreach my $var (@vars) { @@ -40,11 +39,22 @@ foreach my $var (@vars) { } if (exists $ARGS{$lname}) { $a{$name}= $ARGS{$lname}; + my @html= grep { $_->[0] eq $a{$name} } @{ $var->{Values} }; + $ahtml{$name}= @html==1 ? $html[0][1] : '???'; } else { $a{$name}= $var->{Values}[0][0]; + $ahtml{$name}= $var->{Values}[0][1]; } } + +<% ucfirst $ahtml{Query} %> - YARRG + +YARRG - + Yet Another Revenue Research Gatherer +

+<%perl> + my %baseqf; foreach my $var (@vars) { my $lname= lc $var->{Name}; @@ -61,8 +71,11 @@ foreach my $var (keys %ARGS) { $queryqf{$var}= $val; } -my $uri= URI->new($m->current_comp()->name()); -my $quri= sub { $uri->query_form(@_); $uri->path_query(); }; +my $quri= sub { + my $uri= URI->new($m->current_comp()->name()); + $uri->query_form(@_); + $uri->path_query(); +}; foreach my $var (@vars) { my $name= $var->{Name}; @@ -101,6 +114,9 @@ $debug => 0 $routestring => '' +%########### query `route' ########## +% if ($a{Query} eq 'route') { +

Specify route

Market data age