From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 15 Aug 2009 23:52:15 +0000 (+0100)
Subject: Remove query-specific invocations from lookup (regexp preserving query entries remains)
X-Git-Tag: 3.4~186
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=796f9c172398b390fb4a0fc3e72b51a58a95a69f

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

diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index 38d87d6..1bd8c79 100755
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -141,6 +141,8 @@ foreach my $var (@vars) {
 
 #---------- initial checks, startup, main entry form ----------
 
+die if $a{Query} =~ m/[^a-z]/;
+
 dbw_connect($a{Ocean});
 
 </%perl>
@@ -150,17 +152,7 @@ $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_age, %baseqf, %queryqf &>
-
-% } ########## end of `age' query ##########
+<& "query_$a{Query}", %baseqf, %queryqf, quri => $quri, a => \%a &>
 
 %#---------- debugging and epilogue ----------