+<& navbar &>
+% }
<%perl>
foreach my $var (@vars) {
@@ -115,7 +165,15 @@ foreach my $var (@vars) {
foreach my $var (keys %ARGS) {
next unless $var =~
- m/^(?:(?:route|commod)string|islandid\d|archipelago\d|debug)$/;
+ m/^(?: (?:route|commod|capacity|capital|minprofit
+ |island)string |
+ lossperleague | distance |
+ commodid |
+ islandid \d |
+ archipelago \d |
+ debug |
+ [RT]\w+
+ )$/x;
my $val= $ARGS{$var};
next if $val eq 'none';
$queryqf{$var}= $val;
@@ -127,7 +185,9 @@ my $quri= sub {
$uri->path_query();
};
-foreach my $var (@vars) {
+my $prselector_core= sub {
+ my ($var)= @_;
+ return if printable($m);
my $name= $var->{Name};
my $lname= lc $var->{Name};
my $delim= $var->{Before};
@@ -135,7 +195,7 @@ foreach my $var (@vars) {
my $cvalix= 0;
foreach my $valr (@{ $var->{Values} }) {
print $delim; $delim= "\n|\n";
- my ($value,$html) = @$valr;
+ my ($value,$html,$finally) = @$valr;
my $iscurrent= &{$var->{CmpCanon}}($value) eq $canon;
my $after;
if ($iscurrent) {
@@ -144,6 +204,7 @@ foreach my $var (@vars) {
} else {
my %qf= (%baseqf,%queryqf);
delete $qf{$lname};
+ delete $qf{$_} foreach grep { m/^[A-Z]/ } keys %qf;
$qf{$lname}= $value if $cvalix;
@@ -151,22 +212,42 @@ foreach my $var (@vars) {
$after= '';
}
print $html, $after;
+ print " ", $finally if defined $finally;
$cvalix++;
}
print "
\n\n";
+};
+
+my $prselector= sub {
+ my ($name)= @_;
+ foreach my $var (@vars) {
+ if ($var->{Name} eq $name) {
+ $prselector_core->($var);
+ return;
+ }
+ }
+ die $name;
+};
+
+foreach my $var (@vars) {
+ next if $var->{QuerySpecific};
+ $prselector_core->($var);
}
#---------- initial checks, startup, main entry form ----------
die if $styles{Query} =~ m/[^a-z]/;
-dbw_connect($styles{Ocean});
+my $mydbh;
+my $dbh= ($mydbh= dbw_connect($styles{Ocean}));
my $results_head_done=0;
my $someresults= sub {
return if $results_head_done;
$results_head_done=1;
- print "\n
Results
\n";
+ my ($h)= @_;
+ $h= 'Results' if !$h;
+ print "\n
$h
\n";
};
@@ -174,9 +255,15 @@ my $someresults= sub {
$debug => 0
+% if (!printable($m)) {
+