Remove query-specific invocations from lookup (regexp preserving query entries remains)

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 38d87d6352d9b96c4a82f059e171c1a336f0d176..1bd8c79279be4315cce57d2dbfd9e8ab78469a88 100755 (executable)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -141,6 +141,8 @@ foreach my $var (@vars) {
 
 #---------- initial checks, startup, main entry form ----------
 
 
 #---------- initial checks, startup, main entry form ----------
 

+die if $a{Query} =~ m/[^a-z]/;
+

 dbw_connect($a{Ocean});
 
 </%perl>
 dbw_connect($a{Ocean});
 
 </%perl>


@@ -150,17 +152,7 @@ $debug => 0
 
 <hr>
 
 
 <hr>
 

-%########### query `route' ##########
-% if ($a{Query} eq 'route') {
-
-<& query_route, %baseqf, %queryqf, quri => $quri, a => \%a &>
-
-% } elsif ($a{Query} eq 'age') {
-% ########### query `age' ##########
-
-<& query_age, %baseqf, %queryqf &>
-
-% } ########## end of `age' query ##########
+<& "query_$a{Query}", %baseqf, %queryqf, quri => $quri, a => \%a &>

 
 %#---------- debugging and epilogue ----------
 
 
 %#---------- debugging and epilogue ----------