X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=a4e9a067e1b4c40b9c31215ad1bcc9abaee3f2fb;hb=e85ef56a3b2eff647efc77e44ba5ba0a19e53393;hp=393e7a668755145d05262a56b56ed005330669c1;hpb=59bee7afb77216585b904bd20f17e71005e9778c;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/query_route b/yarrg/web/query_route
index 393e7a6..a4e9a06 100644
--- a/yarrg/web/query_route
+++ b/yarrg/web/query_route
@@ -38,15 +38,18 @@ $quri
$dbh
$prselector
$routestring => '';
+$capacitystring => '';
+$lossperleague => '';
+$capitalstring => '';
$someresults
$emsgokorprint
%args>
<%perl>
my $emsg;
+my @warningfs;
my @archipelagoes;
my @islandids;
-my %islandid2;
my $qa= \%ARGS;
@@ -61,171 +64,67 @@ my $goupdate= sub { $be_post ? 'Update' : 'Go' };
%perl>
-
Specify route
-
-% $prselector->('ShowStalls');
-
-%#---------- textbox, user enters route as string ----------
+% # Sadly we need to do this rather hacky thing to make it be a POST
+% # form if the user has already selected some thing(s)
% if (!$qa->{Dropdowns}) {
-
-Enter route (islands, or archipelagoes, separated by |s or commas;
- abbreviations are OK):
-
-% $startform->($routestring =~ m/\S/);
-
-<&| qtextstring, qa => $qa, dbh => $dbh,
- thingstring => 'routestring', emsgstore => \$emsg,
- perresult => sub {
- my ($canonname, $island, $arch) = @_;
- push @islandids, $island;
- push @archipelagoes, defined $island ? undef : $arch;
- }
- &>
- size=80
-&>
-
-% } else { #---------- dropdowns, user selects from menus ----------
-
-% $startform->(grep {
-% defined $ARGS{"archipelago$_"} ||
-% defined $ARGS{"islandid$_"}
+% $startform->($routestring =~ m/\S/);
+% } else {
+% $startform->(grep {
+% defined $qa->{"archipelago$_"} ||
+% defined $qa->{"islandid$_"}
% } (0..$qa->{Dropdowns}-1));
+% }
-<%perl>
-my ($sth,$row);
-my @archlistdata;
-my %islandlistdata;
-$islandlistdata{'none'}= [ [ "none", "Select island..." ] ];
-
-my $optionlistmap= sub {
- my ($optlist, $selected) = @_;
- my $out='';
- foreach my $entry (@$optlist) {
- $out.= sprintf('',
- encode_entities($entry->[0]),
- defined $selected && $entry->[0] eq $selected
- ? 'selected' : '',
- encode_entities($entry->[1]));
- }
- return $out;
-};
-
-$sth= $dbh->prepare("SELECT DISTINCT archipelago FROM islands
- ORDER BY archipelago;");
-$sth->execute();
-
-while ($row=$sth->fetchrow_arrayref) {
- my ($arch)= @$row;
- push @archlistdata, [ $arch, $arch ];
- $islandlistdata{$arch}= [ [ "none", "Whole arch" ] ];
-}
+
-$sth= $dbh->prepare("SELECT islandid,islandname,archipelago
- FROM islands
- ORDER BY islandname;");
-$sth->execute();
+
Specify route
-while ($row=$sth->fetchrow_arrayref) {
- my $arch= $row->[2];
- push @{ $islandlistdata{'none'} }, [ @$row ];
- push @{ $islandlistdata{$arch} }, [ @$row ];
- $islandid2{$row->[0]}= { Name => $row->[1], Arch => $arch };
-}
+% $prselector->('ShowStalls');
-my %resetislandlistdata;
-foreach my $arch (keys %islandlistdata) {
- $resetislandlistdata{$arch}=
- $optionlistmap->($islandlistdata{$arch}, '');
-}
+<& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg,
+ warningfs_r => \@warningfs,
+ enterwhat => 'Enter route',
+ islandids_r => \@islandids,
+ archipelagoes_r => \@archipelagoes
+ &>
-%perl>
+%#---------- textboxes, user enters details as strings ----------
+% my $routeparams= { EmsgRef => \$emsg };
+% if (!$qa->{Dropdowns}) {
-<&| script &>
-ms_lists= <% to_json_protecttags(\%resetislandlistdata) %>;
-function ms_Setarch(dd) {
- debug('ms_SetArch '+dd+' arch='+arch);
- var arch= document.getElementsByName('archipelago'+dd).item(0).value;
- var got= ms_lists[arch];
- if (got == undefined) return; // unknown arch ? hrm
- debug('ms_SetArch '+dd+' arch='+arch+' got ok');
- var select= document.getElementsByName('islandid'+dd).item(0);
- select.innerHTML= got;
- debug('ms_SetArch '+dd+' arch='+arch+' innerHTML set');
-}
-&script>
-
-
-
-
-% for my $dd (0..$qa->{Dropdowns}-1) {
-
- |
-% }
-
-
-
-% for my $dd (0..$qa->{Dropdowns}-1) {
-% my $arch= $ARGS{"archipelago$dd"};
-% $arch= 'none' if !defined $arch;
-
- |
-% }
-
-
-
+<& enter_advrouteopts, qa=>$qa, dbh=>$dbh, routeparams=>$routeparams &>
% } #---------- end of dropdowns, now common middle of page code ----------
-% my $ours= sub { $_[0] =~ m/^island|^archipelago|^routestring|^[RT]/; };
+% my $ours= sub { $_[0] =~
+% m/^island|^archipelago|^routestring|^capacitystring|^lossperleague|^capitalstring|^[RT]/;
+% };
<& "lookup:formhidden", ours => $ours &>
+
+
<%perl>
#========== results ==========
$emsgokorprint->($emsg) or @islandids=();
-my $argorundef= sub {
- my ($dd,$base) = @_;
- my $thing= $ARGS{"${base}${dd}"};
- $thing= undef if defined $thing and $thing eq 'none';
- return $thing;
-};
-
-for my $dd (0..$qa->{Dropdowns}-1) {
- my $arch= $argorundef->($dd,'archipelago');
- my $island= $argorundef->($dd,'islandid');
- next unless defined $arch or defined $island;
- if (defined $island and defined $arch) {
- my $ii= $islandid2{$island};
- my $iarch= $ii->{Arch};
- if ($iarch ne $arch) {
- $someresults->();
-%perl>
- Specified archipelago <% $arch %> but
- island <% $ii->{Name} %>
- which is in <% $iarch %>; using the island.
-<%perl>
- }
- $arch= undef;
- }
- push @archipelagoes, $arch;
- push @islandids, $island;
+foreach my $warningf (@warningfs) {
+ $someresults->();
+ $warningf->();
}
%perl>
% if (@islandids) {
-% $someresults->('Relevant trades');
+% $someresults->();
<& routetrade,
dbh => $dbh,
islandids => \@islandids,
archipelagoes => \@archipelagoes,
- qa => $qa
+ qa => $qa,
+ routeparams => $routeparams
&>
-
% }
+
+