chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
555fcf1
)
Multiple queries work
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 13 Aug 2009 11:41:21 +0000
(12:41 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 13 Aug 2009 11:41:21 +0000
(12:41 +0100)
yarrg/web/lookup
patch
|
blob
|
history
diff --git
a/yarrg/web/lookup
b/yarrg/web/lookup
index 9c00a65466481bd3e6e1633fa3fe0c7fbf418f9a..ae22b33002965655492c2bc2b12682670853f1a8 100644
(file)
--- a/
yarrg/web/lookup
+++ b/
yarrg/web/lookup
@@
-1,11
+1,6
@@
-<html><head><title>Route - YARRG</title></head><body>
-
-<a href="<% $m->current_comp()->name() %>">YARRG</a> -
- Yet Another Revenue Research Gatherer
-<p>
-
<%perl>
my %a;
<%perl>
my %a;
+my %ahtml;
my @vars;
# for output:
my @vars;
# for output:
@@
-27,6
+22,10
@@
my %islandid2;
CmpCanon => sub { !!$_[0] },
Values => [ [ 0, 'Type in names' ],
[ 4, 'Select from menus' ] ]
CmpCanon => sub { !!$_[0] },
Values => [ [ 0, 'Type in names' ],
[ 4, 'Select from menus' ] ]
+ }, { Name => 'Query',
+ Before => 'Query: ',
+ Values => [ [ 'route', 'Trades for route' ],
+ [ 'age', 'Data age' ] ]
});
foreach my $var (@vars) {
});
foreach my $var (@vars) {
@@
-40,11
+39,22
@@
foreach my $var (@vars) {
}
if (exists $ARGS{$lname}) {
$a{$name}= $ARGS{$lname};
}
if (exists $ARGS{$lname}) {
$a{$name}= $ARGS{$lname};
+ my @html= grep { $_->[0] eq $a{$name} } @{ $var->{Values} };
+ $ahtml{$name}= @html==1 ? $html[0][1] : '???';
} else {
$a{$name}= $var->{Values}[0][0];
} else {
$a{$name}= $var->{Values}[0][0];
+ $ahtml{$name}= $var->{Values}[0][1];
}
}
}
}
+</%perl>
+<html><head><title><% ucfirst $ahtml{Query} %> - YARRG</title></head><body>
+
+<a href="<% $m->current_comp()->name() %>">YARRG</a> -
+ Yet Another Revenue Research Gatherer
+<p>
+<%perl>
+
my %baseqf;
foreach my $var (@vars) {
my $lname= lc $var->{Name};
my %baseqf;
foreach my $var (@vars) {
my $lname= lc $var->{Name};
@@
-61,8
+71,11
@@
foreach my $var (keys %ARGS) {
$queryqf{$var}= $val;
}
$queryqf{$var}= $val;
}
-my $uri= URI->new($m->current_comp()->name());
-my $quri= sub { $uri->query_form(@_); $uri->path_query(); };
+my $quri= sub {
+ my $uri= URI->new($m->current_comp()->name());
+ $uri->query_form(@_);
+ $uri->path_query();
+};
foreach my $var (@vars) {
my $name= $var->{Name};
foreach my $var (@vars) {
my $name= $var->{Name};
@@
-101,6
+114,9
@@
$debug => 0
$routestring => ''
</%args>
$routestring => ''
</%args>
+%########### query `route' ##########
+% if ($a{Query} eq 'route') {
+
<h1>Specify route</h1>
<form action="<% $quri->() %>" method="get">
<h1>Specify route</h1>
<form action="<% $quri->() %>" method="get">
@@
-324,6
+340,13
@@
for my $dd (0..$a{Dropdowns}-1) {
% }
% }
+% } elsif ($a{Query} eq 'age') {
+% ########### query `age' ##########
+
+<h1>Market data age</h1>
+
+% } ########## end of `age' query ##########
+
%#---------- debugging and epilogue ----------
% if ($debug) {
%#---------- debugging and epilogue ----------
% if ($debug) {