Revamp qtextstring arrangements

[ypp-sc-tools.main.git] / yarrg / web / lookup

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 751a99aa1a6916382c3843c610eda6691a02868b..a118de0905a4d1e58cd500fcc732b20811f847ef 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -35,9 +35,9 @@
 
 </%doc>
 <%perl>
-my %a;
 my %ahtml;
 my @vars;
+my %styleqf;
 
 #---------- "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,11 +70,12 @@ 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];
        }
 }
@@ -114,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";
@@ -141,9 +143,9 @@ foreach my $var (@vars) {
 
 #---------- initial checks, startup, main entry form ----------
 
-die if $a{Query} =~ m/[^a-z]/;
+die if $styleqf{Query} =~ m/[^a-z]/;
 
-dbw_connect($a{Ocean});
+dbw_connect($styleqf{Ocean});
 
 </%perl>
 <%args>
@@ -152,7 +154,7 @@ $debug => 0
 
 <hr>
 
-<& "query_$a{Query}", %baseqf, %queryqf, quri => $quri, a => \%a &>
+<& "query_$styleqf{Query}", %baseqf, %queryqf, %styleqf, quri => $quri &>
 
 <p>