X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=f194fc5d56d2cb3f4a6a2e955dd0b84c3493cfc2;hb=98610392fde2add293bee6199f2de1d6f88559d8;hp=931594a2b71ce718d615bbfecf46e09c00c9d5d2;hpb=efc8497c2414dfded724d7181e11df53b947e387;p=ypp-sc-tools.web-live.git diff --git a/yarrg/web/lookup b/yarrg/web/lookup index 931594a..f194fc5 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 %styles; #---------- "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,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]; } } %perl> + +<%shared> +my %baseqf; +my %queryqf; +%shared> + +<%method formhidden> +<%args> +$ours +%args> +% foreach my $n (keys %baseqf, keys %queryqf) { +% next if $ours->($n); +% my $v= exists $baseqf{$n} ? $baseqf{$n} : $queryqf{$n}; + value="<% $v |h %>"> +% } +%method> +
<%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; @@ -119,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"; @@ -146,249 +158,38 @@ foreach my $var (@vars) { #---------- initial checks, startup, main entry form ---------- -dbw_connect($a{Ocean}); +die if $styles{Query} =~ m/[^a-z]/; + +my $mydbh; +my $dbh= ($mydbh= dbw_connect($styles{Ocean})); + +my $results_head_done=0; +my $someresults= sub { + return if $results_head_done; + $results_head_done=1; + print "\n
%#---------- debugging and epilogue ---------- @@ -416,3 +217,8 @@ use HTML::Entities; use URI::Escape; %init> +<%cleanup> + +$mydbh->rollback() if $mydbh; + +%cleanup>