X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_route;h=2162e8a8bbf203c7336c561d217374c378d11043;hp=adcb89deea5b2a7af860c79b5c9403756a811158;hb=991b38b009b25da6992e9d984cd74d0e47c3c0b6;hpb=3f99b04acd8cf6080069b542206f9f3de049f58a diff --git a/yarrg/web/query_route b/yarrg/web/query_route index adcb89d..2162e8a 100644 --- a/yarrg/web/query_route +++ b/yarrg/web/query_route @@ -38,135 +38,112 @@ $quri $dbh $prselector $routestring => ''; +$capacitystring => ''; +$lossperleague => ''; +$capitalstring => ''; $someresults $emsgokorprint <%perl> my $emsg; +my @warningfs; my @archipelagoes; my @islandids; -my %islandid2; +my ($max_volume, $max_mass); +my $lossperleaguepct; +my $capital; my $qa= \%ARGS; + +my $be_post; +my $startform= sub { + ($be_post)= @_; +
+<%perl> +}; +my $goupdate= sub { $be_post ? 'Update' : 'Go' }; -

Specify route

+ -% $prselector->('ShowStalls'); +

Specify route

-%#---------- 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}) { +% $startform->($routestring =~ m/\S/); +% } else { +% $startform->(grep { +% defined $qa->{"archipelago$_"} || +% defined $qa->{"islandid$_"} +% } (0..$qa->{Dropdowns}-1)); +% } -Enter route (islands, or archipelagoes, separated by |s or commas; - abbreviations are OK):
- - +% $prselector->('ShowStalls'); -<&| qtextstring, qa => $qa, dbh => $dbh, - thingstring => 'routestring', emsgstore => \$emsg, - perresult => sub { - my ($canonname, $island, $arch) = @_; - push @islandids, $island; - push @archipelagoes, defined $island ? undef : $arch; - } +<& enter_route, qa => $qa, dbh => $dbh, emsg_r => \$emsg, + warningfs_r => \@warningfs, + enterwhat => 'Enter route', + islandids_r => \@islandids, + archipelagoes_r => \@archipelagoes &> - size=80 - - -% } else { #---------- dropdowns, user selects from menus ---------- -<%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" ] ]; -} +%#---------- textboxes, user enters details as strings ---------- +% if (!$qa->{Dropdowns}) { -$sth= $dbh->prepare("SELECT islandid,islandname,archipelago - FROM islands - ORDER BY islandname;"); -$sth->execute(); +Advanced options - you may leave these blank: +

+ + +
-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 }; -} +Vessel or capacity: +<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'cs', + thingstring => 'capacitystring', emsgstore => \$emsg, + helpref => 'capacity', + onresults => sub { ($max_mass,$max_volume) = @_; } + &> + size=40 + -my %resetislandlistdata; -foreach my $arch (keys %islandlistdata) { - $resetislandlistdata{$arch}= - $optionlistmap->($islandlistdata{$arch}, ''); -} + +  +  - + +Expected losses: -<&| 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'); -} - +<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'll', + thingstring => 'lossperleague', emsgstore => \$emsg, + helpref => 'losses', + onresults => sub { ($lossperleaguepct)= @_; } + &> + size=9 + - +
+ - -% for my $dd (0..$qa->{Dropdowns}-1) { - -% } - + -% for my $dd (0..$qa->{Dropdowns}-1) { -% my $arch= $ARGS{"archipelago$dd"}; -% $arch= 'none' if !defined $arch; - -% } +<&| qtextstring, qa => $qa, dbh => $dbh, prefix => 'ac', + thingstring => 'capitalstring', emsgstore => \$emsg, + helpref => 'capital', + onresults => sub { ($capital)= @_; } + &> + size=9 + + -
-
Available capital: -
-
% } #---------- 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> @@ -174,43 +151,24 @@ function ms_Setarch(dd) { $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->(); - - 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->(); } % if (@islandids) { -% $someresults->(); +% $someresults->('Relevant trades'); <& routetrade, dbh => $dbh, islandids => \@islandids, archipelagoes => \@archipelagoes, - qa => $qa + qa => $qa, + max_mass => $max_mass, + max_volume => $max_volume, + lossperleaguepct => $lossperleaguepct, + max_capital => $capital &> - % } +