X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommods.pm;h=f4fb346c99466023e12d209ee5ce08f3d498f54a;hb=8fe4fd369f976fad429139aca1885af6a67e983d;hp=dff539d87166a7e3b7e114d6a0d9d68be6c0f06c;hpb=ba90e716f4b27b89529109654ddb82b3990fc8fb;p=ypp-sc-tools.main.git

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index dff539d..f4fb346 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -42,12 +42,14 @@ BEGIN {
 		      &pipethrough_run_along &pipethrough_run_finish
 		      &pipethrough_run_gzip
 		      &cgipostform &yarrgpostform &cgi_get_caller
-		      &set_ctype_utf8);
+		      &set_ctype_utf8 $masterinfoversion);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
 
+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!
@@ -63,7 +65,11 @@ our %commods;
 our (%pctb_commodmap,@pctb_commodmap);
 
 my %colours; # eg $colours{'c'}{'black'}= $sources
-my @rawcm; # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
+my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth'
+
+# IMPORTANT
+#  when extending the format of source-info in a non-backward
+#  compatible way, be sure to update update-master-info too.
 
 sub parse_info1 ($$) {
     my ($mmfn,$src)= @_;
@@ -78,6 +84,8 @@ sub parse_info1 ($$) {
 	    @ctx= (sub { $colours{$colourkind}{lc $_} .= $src; });
 	} elsif (m/^commods$/) {
 	    @ctx= (sub { push @rawcm, lc $_; });
+	} elsif (m/^nocommods$/) {
+	    @ctx= (sub { push @nocm, lc $_; });
 	} elsif (m/^ocean (\w+)$/) {
 	    my $ocean= $1;
 	    @ctx= (sub {
@@ -124,6 +132,7 @@ sub parse_info1 ($$) {
 	    my ($name, $props) = $s =~
 		/^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/
 		or die "bad commodspec $s";
+	    return if grep { $name eq $_ } @nocm;
 	    my $ucname= ucfirst $name;
 	    $commods{$ucname}{Srcs} .= $ss;
 	    my $c= $commods{$ucname};
@@ -167,7 +176,7 @@ sub parse_info1 ($$) {
 sub parse_info_clientside () {
     my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
     return unless $yarrg;
-    my $master= fetch_with_rsync('info');
+    my $master= fetch_with_rsync("info-$masterinfoversion");
     parse_info1($master,'s');
     my $local= '_local-info.txt';
     if (stat $local) {
@@ -209,7 +218,7 @@ sub parse_info_maproutes ($$$) {
 }
 
 sub parse_info_serverside () {
-    parse_info1('master-info.txt','s');
+    parse_info1('source-info.txt','s');
 }
 sub parse_info_serverside_ocean ($) {
     my ($oceanname) = @_;