<%perl>
my %ahtml;
my @vars;
-my %styleqf;
+my %styles;
#---------- "mode" argument parsing and mode menu at top of page ----------
$val= [ $val, encode_entities($val) ];
}
if (exists $ARGS{$lname}) {
- $styleqf{$name}= $ARGS{$lname};
- my @html= grep { $_->[0] eq $styleqf{$name} }
+ $styles{$name}= $ARGS{$lname};
+ my @html= grep { $_->[0] eq $styles{$name} }
@{ $var->{Values} };
$ahtml{$name}= @html==1 ? $html[0][1] : '???';
} else {
- $styleqf{$name}= $var->{Values}[0][0];
+ $styles{$name}= $var->{Values}[0][0];
$ahtml{$name}= $var->{Values}[0][1];
}
}
</%perl>
+
+<%shared>
+my %baseqf;
+my %queryqf;
+</%shared>
+
+<%method formhidden>
+<%args>
+$ours
+</%args>
+% foreach my $n (keys %baseqf, keys %queryqf) {
+% next if $ours->($n);
+% my $v= exists $baseqf{$n} ? $baseqf{$n} : $queryqf{$n};
+<input type=hidden name=<% $n %> value="<% $v |h %>">
+% }
+</%method>
+
<html><head><title><% ucfirst $ahtml{Query} %> - YARRG</title></head><body>
<a href="<% $m->current_comp()->name() |u %>">YARRG</a> -
<p>
<%perl>
-my %baseqf;
foreach my $var (@vars) {
my $lname= lc $var->{Name};
next unless exists $ARGS{$lname};
$baseqf{$lname}= $ARGS{$lname};
}
-my %queryqf;
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?:routestring|islandid\d|archipelago\d|debug)$/;
+ m/^(?:(?:route|commod)string|islandid\d|archipelago\d|debug)$/;
my $val= $ARGS{$var};
next if $val eq 'none';
$queryqf{$var}= $val;
my $name= $var->{Name};
my $lname= lc $var->{Name};
my $delim= $var->{Before};
- my $canon= &{$var->{CmpCanon}}($styleqf{$name});
+ my $canon= &{$var->{CmpCanon}}($styles{$name});
my $cvalix= 0;
foreach my $valr (@{ $var->{Values} }) {
print $delim; $delim= "\n|\n";
#---------- initial checks, startup, main entry form ----------
-die if $styleqf{Query} =~ m/[^a-z]/;
+die if $styles{Query} =~ m/[^a-z]/;
-dbw_connect($styleqf{Ocean});
+dbw_connect($styles{Ocean});
</%perl>
<%args>
<hr>
-<& "query_$styleqf{Query}", %baseqf, %queryqf, %styleqf, quri => $quri &>
+<& "query_$styles{Query}", %baseqf, %queryqf, %styles, quri => $quri &>
<p>