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

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index f17a8ed..b58471c 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,11 +65,19 @@ 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'
-
-sub parse_info1 ($$) {
-    my ($mmfn,$src)= @_;
-    my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!";
+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,$enoentok)= @_;
+    my $mm= new IO::File $mmfn, 'r';
+    if (!$mm) {
+	return if $enoentok && $!==&ENOENT;
+	die "$mmfn $!";
+    }
     my @ctx= ();
     while (<$mm>) {
 	next if m/^\s*\#/;
@@ -78,12 +88,16 @@ 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;
+	    keys %{ $oceans{$ocean} };
 	    @ctx= (sub {
 		$ocean or die; # ref to $ocean needed to work
 		               # around a perl bug
 		my $arch= $_;
+		keys %{ $oceans{$ocean}{$arch} };
 		$ctx[1]= sub {
 		    $oceans{$ocean}{$arch}{$_} .= $src;
 		};
@@ -120,10 +134,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); }
@@ -146,16 +180,9 @@ sub parse_info1 ($$) {
 }
 
 sub parse_info_clientside () {
-    my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
-    return unless $yarrg;
-    my $master= fetch_with_rsync('info');
-    parse_info1($master,'s');
-    my $local= '_local-info.txt';
-    if (stat $local) {
-	parse_info1($local,'s');
-    } else {
-	die "$local $!" unless $! == &ENOENT;
-    }
+    my $master= fetch_with_rsync("info-v$masterinfoversion");
+    parse_info1($master,'s',1);
+    parse_info1('_local-info.txt','s',1);
 }
 
 sub fetch_with_rsync ($) {
@@ -190,12 +217,12 @@ sub parse_info_maproutes ($$$) {
 }
 
 sub parse_info_serverside () {
-    parse_info1('master-info.txt','s');
+    parse_info1('source-info.txt','s',0);
 }
 sub parse_info_serverside_ocean ($) {
     my ($oceanname) = @_;
     die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname};
-    parse_info1("ocean-".(lc $oceanname).".txt",'s');
+    parse_info1("_ocean-".(lc $oceanname).".txt", 's',0);
 }
 
 sub parse_pctb_commodmap () {
@@ -219,9 +246,16 @@ sub parse_pctb_commodmap () {
 sub get_our_version ($$) {
     my ($aref,$prefix) = @_;
     $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
-    $aref->{"${prefix}fixes"}= 'lastpage';
-
-    my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
+    $aref->{"${prefix}fixes"}= 'lastpage checkpager';
+
+    my $version= `
+	if type -p git-describe >/dev/null 2>&1; then
+		gd=git-describe
+	else
+		gd="git describe"
+	fi
+	\$gd --tags HEAD || echo 0unknown
+    `; $? and die $?;
     chomp($version);
     $aref->{"${prefix}version"}= $version;
     return $aref;
@@ -237,6 +271,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;