From 30375dc1932be83a48fca8122e81b845c4b0ecc2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 17 Oct 2009 16:46:52 +0100
Subject: [PATCH] routesearch: show route distances

---
 yarrg/TODO                  |  4 ----
 yarrg/rscommon.h            |  1 +
 yarrg/rsmain.c              |  5 +++--
 yarrg/rssearch.c            |  1 +
 yarrg/web/query_routesearch | 10 ++++++----
 yarrg/x.gdb                 |  2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/yarrg/TODO b/yarrg/TODO
index bc2899a..a23fc65 100644
--- a/yarrg/TODO
+++ b/yarrg/TODO
@@ -1,7 +1,5 @@
 routesearch:
 
-	show distance
-
 	concurrency limit option
 
 query_routesearch:
@@ -11,8 +9,6 @@ query_routesearch:
 	ap=A, ap=P turn into proper headings
 	notes about leagues
 
-	show distance
-
 	links to per-route pages
 
 	concurrency limit
diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 1e6679d..45a5b31 100644
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -123,6 +123,7 @@ void setup_value(void);
 
 typedef struct {
   double value[AP];
+  int length;
   int ports[MAX_ROUTELEN];
 } OnePotentialResult;
 
diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index 345c882..437a13d 100644
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -189,9 +189,10 @@ int main(int argc, const char **argv) {
 	  int midisle= ports[nports/2];
 	  int midarch= route2midarch(ports,nports);
 	  fprintf(output,
-		  " @%2d %c#%2d | start%3d mid%d:%3d f%d:%3d | %5d %5d %4d |",
+		  " @%2d %c#%2d | start%3d mid%d:%3d f%d:%3d"
+		  " | %3dlg | %5d %5d %4d |",
 		  pos, "ap"[ap], nhighscores[granui][ap] - pos,
-		  ports[0], midarch,midisle, finarch,finisle,
+		  ports[0], midarch,midisle, finarch,finisle, pr->length,
 		  (int)hs->value, (int)pr->value[A], (int)pr->value[P]);
 	  for (i=0; i<nports; i++) fprintf(output," %d",ports[i]);
 	  fprintf(output,"\n");
diff --git a/yarrg/rssearch.c b/yarrg/rssearch.c
index 1f43e00..1dd29e5 100644
--- a/yarrg/rssearch.c
+++ b/yarrg/rssearch.c
@@ -156,6 +156,7 @@ static double process_route(int nports, int totaldist,
       } else {
 	int pos;
 	ctr_newbests_granu[granui*AP+ap]++;
+	bucket->prs[ap].length= totaldist;
 	memcpy(bucket->prs[ap].value, value, sizeof(value));
 	memcpy(bucket->prs[ap].ports, ports, sizeof(*ports) * nports);
 	if (nports < MAX_ROUTELEN-1) bucket->prs[ap].ports[nports]= -1;
diff --git a/yarrg/web/query_routesearch b/yarrg/web/query_routesearch
index 6877536..b9b7348 100644
--- a/yarrg/web/query_routesearch
+++ b/yarrg/web/query_routesearch
@@ -166,11 +166,10 @@ while (<$fh>) {
 <% $_ |h %>
 <%perl>
 	}
-	next unless
-  m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
-	my ($ap,$isles) = (uc $1,$4);
+	next unless m/^ \@ *\d+ ([ap])\# *\d+ \|.*\| *(\d+)lg *\| *\d+ +(\d+) +(\d+) *\| ([0-9 ]+)$/;
+	my ($ap,$isles) = (uc $1,$5);
 	next if $results{$ap} && %{$results{$ap}} >= $maxcountea;
-	my $item= { A => $2, P => $3 };
+	my $item= { A => $3, P => $4, Leagues => $2 };
 	my (@i, @a);
 	foreach (split / /, $isles) {
 		my ($name,$arch)= $isleinfo->($_);
@@ -203,12 +202,14 @@ if ($qa->{'debug'}) {
 <tbody>
 <tr>
 <th colspan=2>Profit
+<th>Dist.
 <th>Archipelagoes
 <th colspan=3>Route
 <tr>
 <th>Abs.
 <th>Per.lg.
 <th>
+<th>
 <th>Start
 <th>Via
 <th>Finish
@@ -222,6 +223,7 @@ if ($qa->{'debug'}) {
 <tr class="datarow<% $datarow %>">
 <td align=right><% $item->{A} |h %>
 <td align=right><% $item->{P} |h %>
+<td align=right><% $item->{Leagues} |h %>
 <td align=left><% join ', ', @{ $item->{Archs} } |h %>
 <td align=left><% $item->{Start} |h %>,
 <td align=left><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
diff --git a/yarrg/x.gdb b/yarrg/x.gdb
index 3bb9ef6..b5c490d 100644
--- a/yarrg/x.gdb
+++ b/yarrg/x.gdb
@@ -1,4 +1,4 @@
 file ./routesearch
-set args -d OCEAN-Midnight.db -g 3 -D1 13470 20220 -1 0.0005 search 10 10 30 any 34 7 5 10 35 24 2 2>u
+set args -d OCEAN-Midnight.db -g 3 13470 20220 -1 0.0005 search 0 10 10 30 any 34 7 5 10 35 24 2 2>u
 #break rssearch.c:179 if ports[0]==24 && ports[1]==21
 run
-- 
2.30.2