X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=469f22835fe06da65e5a41807b5c94c13b0019cf;hp=e062e60c6c4b072ca6daf1f96709f0d111e87cad;hb=2961c979e0f7bdae7183d49ab7fab5f5830dff4e;hpb=63f1acf6e7821a94d3a906ba831203ff916e7893 diff --git a/yarrg/web/lookup b/yarrg/web/lookup index e062e60..469f228 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}; @@ -56,11 +66,16 @@ my %queryqf; foreach my $var (keys %ARGS) { next unless $var =~ m/^(?:routestring|islandid\d|archipelago\d|debug)$/; - $queryqf{$var}= $ARGS{$var}; + my $val= $ARGS{$var}; + next if $val eq 'none'; + $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('lookup'); + $uri->query_form(@_); + $uri->path_query(); +}; foreach my $var (@vars) { my $name= $var->{Name}; @@ -99,6 +114,9 @@ $debug => 0 $routestring => '' +%########### query `route' ########## +% if ($a{Query} eq 'route') { +

Specify route