X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=f4fb346c99466023e12d209ee5ce08f3d498f54a;hp=f17a8ed289d6b4d9567df4e99ab8963428e89d52;hb=ab84a4347f797dda5c1ea7b9b0ac2d724e5f49cd;hpb=44285f9f7bdb6d7e21879b5bb85c7e71049ad0cb

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index f17a8ed..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 {
@@ -120,10 +128,30 @@ sub parse_info1 ($$) {
     $ca= sub {
 	my ($s,$ss) = @_;
 #print "ca($s)\n";
-	if ($s !~ m/\%(\w+)/) { $commods{ucfirst $s}{Srcs} .= $ss; return; }
+	if ($s !~ m/\%(\w+)/) {
+	    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};
+	    $c->{Volume}= 1000;
+	    foreach my $prop (defined $props ? split /\s+/, $props : ()) {
+		if ($prop =~ m/^([1-9]\d*)(k?)g$/) {
+		    $c->{Mass}= $1 * ($2 ? 1000 : 1);
+		} elsif ($prop =~m/^([1-9]\d*)l$/) {
+		    $c->{Volume}= $1 * 1000;
+		} else {
+		    die "unknown property $prop for $ucname";
+		}
+	    }
+	    return;
+	}
 	die "unknown $&" unless defined $colours{$1};
-	foreach my $c (keys %{ $colours{$1} }) {
-	    &$ca($`.$c.$', $ss .'%'. $colours{$1}{$c});
+	my ($lhs,$pctlet,$rhs)= ($`,$1,$');
+	foreach my $c (keys %{ $colours{$pctlet} }) {
+	    &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c});
 	}
     };
     foreach (@rawcm) { &$ca($_,$src); }
@@ -148,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) {
@@ -190,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) = @_;
@@ -237,6 +265,7 @@ sub pipethrough_prep () {
 
 sub pipethrough_run_along ($$$@) {
     my ($tf, $childprep, $cmd, @a) = @_;
+    $tf->error and die $!;
     $tf->flush or die $!;
     $tf->seek(0,0) or die $!;
     my $fh= new IO::File;