X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Fquery_routesearch;h=fadc20ed8db5d0b5b12e6942ba09742c9fa3854b;hp=36e6055b898610a3ccb2910e641203f9923bbddd;hb=cb6af6f4bf6b6c3f7852912ebec58e773a724a5a;hpb=fbe374c3592808f9b3f105ec0726b26ada6c0ea0

diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 36e6055..fadc20e 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -42,6 +42,7 @@ $capacitystring => '';
 $lossperleague => '';
 $capitalstring => '';
 $distance => '';
+$someresults
 $emsgokorprint
 </%args>
 
@@ -89,7 +90,7 @@ This feature is not available from the "drop down menus" interface.
  </&>
 </&>
 
-<input type=submit name=submit value="Go">
+<input type=submit name=submit value="Search">
 % my $ours= sub { $_[0] =~ m/^lossperleague|^islandstring|^capitalstring|^capacitystring|^distance/; };
 <& "lookup:formhidden", ours => $ours &>
 
@@ -202,6 +203,9 @@ while (<$fh>) {
 	delete $linkqf{'query'};
 	$linkqf{'routestring'}= join ', ', @fi;
 	$item->{Url}= $quri->(%linkqf);
+	$item->{ArchesString}= join ', ', @a;
+	$item->{ViasString}= join ' ', map { $_.',' } @{ $item->{Vias} };
+	$item->{RouteSortString}= join ', ', @i;
 	$results{$ap}{$isles}= $item;
 }
 
@@ -252,6 +256,8 @@ seconds of CPU time so more processing resources should be available soon.
 	return;
 }
 
+$someresults->();
+
 </%perl>
 % foreach my $ap (qw(A P)) {
 %	if ($ap eq 'A') {
@@ -259,44 +265,67 @@ seconds of CPU time so more processing resources should be available soon.
 %	} else {
 <h2>Best routes for profit per league</h2>
 %	}
-<table rules=groups>
+<table rules=groups id="ap<% $ap %>_table">
 <colgroup span=2>
 <colgroup span=1>
 <colgroup span=1>
 <colgroup span=3>
-<tbody>
 <tr>
 <th colspan=2>Profit
 <th>Dist.
 <th>Archipelagoes
-<th colspan=3>Route
+<th>
+<th>Route
+<th>
 <tr>
 <th>Abs.
 <th>Per.lg.
 <th>
-<th>
+<th>(link to plan)
 <th>Start
 <th>Via
 <th>Finish
-<tbody>
+<tr>
+<tr id="ap<% $ap %>_sortrow"><th><th><th><th><th><th><th>
 %	my $datarow=0;
+%	my %sortkeys;
 %	foreach my $isles (sort {
 %			$results{$ap}{$b}{$ap} <=>
 %			$results{$ap}{$a}{$ap}
 %		} keys %{$results{$ap}}) {
 %		my $item= $results{$ap}{$isles};
-<tr class="datarow<% $datarow %>">
+%		my $ci=0;
+%		my $rowid= "r${ap}$isles"; $rowid =~ y/ /_/;
+%		foreach my $k (qw(A P Leagues ArchesString
+%			          Start RouteSortString Finish)) {
+%			$sortkeys{$ci}{$rowid}= $item->{$k};
+%			$ci++;
+%		}
+<tr class="datarow<% $datarow %>" id="<% $rowid %>">
 <td align=right><% $item->{A} |h %>
 <td align=right><% $item->{P} |h %>
 <td align=right><% $item->{Leagues} |h %>
-<td align=left><a href="<% $item->{Url} |h %>"><% join ', ', @{ $item->{Archs} } |h %></a>
+<td align=left><a href="<% $item->{Url} |h %>"><%
+		  $item->{ArchesString} |h %></a>
 <td align=left><% $item->{Start} |h %>,
-<td align=left><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
+<td align=left><% $item->{ViasString} |h %>
 <td align=left><% $item->{Finish} |h %>
 </td>
 %		$datarow ^= 1;
 %	} # $isles
 </table>
+<&| tabsort,	table => "ap${ap}_table", sortkeys => "ap${ap}_sortkeys",
+		throw => "ap${ap}_sortrow", rowclass => "datarow", cols => [
+		{ DoReverse => 1, Numeric => 1 },
+		{ DoReverse => 1, Numeric => 1 },
+		{ DoReverse => 1, Numeric => 1 },
+		{ },
+		{ },
+		{ },
+		{ },
+	] &>
+  ap<% $ap %>_sortkeys= <% to_json_protecttags(\%sortkeys) %>;
+</&tabsort>
 % } # $ap
 
 <p>