X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Flookup;h=a118de0905a4d1e58cd500fcc732b20811f847ef;hb=b6d8c4a781c0bedf79a4b13af5afe9ad47de97ed;hp=38d87d6352d9b96c4a82f059e171c1a336f0d176;hpb=aed32e2dcb952bcfc9678eef4125e269f538edf2;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 38d87d6..a118de0 100755
--- 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,7 +143,9 @@ 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>
@@ -150,17 +154,9 @@ $debug => 0
 
 <hr>
 
-%########### query `route' ##########
-% if ($a{Query} eq 'route') {
-
-<& query_route, %baseqf, %queryqf, quri => $quri, a => \%a &>
-
-% } elsif ($a{Query} eq 'age') {
-% ########### query `age' ##########
+<& "query_$styleqf{Query}", %baseqf, %queryqf, %styleqf, quri => $quri &>
 
-<& query_age, %baseqf, %queryqf &>
-
-% } ########## end of `age' query ##########
+<p>
 
 %#---------- debugging and epilogue ----------