From 6a7caa99e3c1d5ef70ec3858884e0fdda863792a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Sep 2009 18:07:16 +0100
Subject: [PATCH] Remove obsolete %routes and %route_mysteries - leftovers from
 manual routing

---
 yarrg/Commods.pm             | 41 +-----------------------------------
 yarrg/db-idempotent-populate |  6 ------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 7a29edc..44cc74e 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -35,7 +35,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&parse_info_clientside &fetch_with_rsync
 		      &parse_info_serverside &parse_info_serverside_ocean
-		      %oceans %commods %clients %routes %route_mysteries
+		      %oceans %commods %clients
 		      %vessels %shotname2damage
 		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
 		      &get_our_version &check_tsv_line
@@ -53,8 +53,6 @@ our $masterinfoversion= 2; # version we understand
 
 our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources;
 our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ];
-our %routes; # eg $routes{'Midnight'}{'Orca'}{'Tinga'}= $sources  NB abbrevs!
-our %route_mysteries; # eg $route_mysteries{'Midnight'}{'Norse'}= 3
 our %vessels; # eg $vessels{'War Brig'}{Shot}='medium'
               #    $vessels{'War Brig'}{Volume}= 81000
               #    $vessels{'War Brig'}{Mass}= 54000
@@ -122,12 +120,6 @@ sub parse_info1 ($$) {
 		m/^ ([a-z]+) \s+ (\d+) $/x or die;
 		$shotname2damage{$1}= $2;
 	    });
-	} elsif (m/^routes (\w+)$/) {
-	    my $ocean= $1;
-	    @ctx= (sub {
-		m/^(\S[^\t]*\S),\s*(\S[^\t]*\S),\s*([1-9][0-9]{0,2})$/ or die;
-		$routes{$ocean}{$1}{$2}= $3;
-	    });
 	} elsif (m/^client (\S+.*\S)$/) {
 	    my $client= $1;
 	    $clients{$client}= [ ];
@@ -181,22 +173,6 @@ sub parse_info1 ($$) {
 	}
     };
     foreach (@rawcm) { &$ca($_,$src); }
-
-    foreach my $on (keys %routes) {
-	my $routes= $routes{$on};
-	my $ocean= $oceans{$on};
-	die unless defined $ocean;
-	
-	my @allislands;
-	foreach my $an (sort keys %$ocean) {
-	    my $arch= $ocean->{$an};
-	    push @allislands, sort keys %$arch;
-	}
-	parse_info_maproutes($on, \@allislands, $routes);
-	foreach my $route (values %$routes) {
-	    parse_info_maproutes($on, \@allislands, $route);
-	}
-    }
 }
 
 sub parse_info_clientside () {
@@ -228,21 +204,6 @@ sub fetch_with_rsync ($) {
     return $local;
 }
 
-sub parse_info_maproutes ($$$) {
-    my ($on, $allislands, $routemap) = @_;;
-    foreach my $k (sort keys %$routemap) {
-	my @ok= grep { index($_,$k) >= 0 } @$allislands;
-	die "ambiguous $k" if @ok>1;
-	if (!@ok) {
-	    $route_mysteries{$on}{$k}++;
-	    delete $routemap->{$k};
-	} elsif ($ok[0] ne $k) {
-	    $routemap->{$ok[0]}= $routemap->{$k};
-	    delete $routemap->{$k};
-	}
-    }
-}
-
 sub parse_info_serverside () {
     parse_info1('source-info.txt','s');
 }
diff --git a/yarrg/db-idempotent-populate b/yarrg/db-idempotent-populate
index 43a2f0d..1d106f2 100755
--- a/yarrg/db-idempotent-populate
+++ b/yarrg/db-idempotent-populate
@@ -160,9 +160,3 @@ END
     }
     $dbh->commit;
 }
-
-#---------- island list ----------
-#---------- routes ----------
-# now done by yppedia-chart-parser
-
-__DATA__
-- 
2.30.2