Merge branch 'stable-3.x'

diff --combined yarrg/Commods.pm
index f4fb346c99466023e12d209ee5ce08f3d498f54a,f2823136fc69b89bb727af177e445055cfcfb3db..c10965b2dfb75c0f63cf531e7d355ccbdaafaa84
--- 1/yarrg/Commods.pm
--- 2/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@@ -41,35 -41,24 +41,35 @@@ BEGIN 
                      &pipethrough_prep &pipethrough_run
                      &pipethrough_run_along &pipethrough_run_finish
                      &pipethrough_run_gzip
 -                    &cgipostform &yarrgpostform &cgi_get_caller);
 +                    &cgipostform &yarrgpostform &cgi_get_caller
 +                    &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 %commods; # eg $commods{'Fine black cloth'}= $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
  # $sources = 's[l]b';
  #       's' = Special Circumstances; 'l' = local ; B = with Bleach
  
 +our %commods;
 +# eg $commods{'Fine black cloth'}{Srcs}= $sources;
 +# eg $commods{'Fine black cloth'}{Mass}= 700 [g]
 +# eg $commods{'Fine black cloth'}{Volume}= 1000 [ml]
 +
  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)= @_;
@@@ -84,8 -73,6 +84,8 @@@
            @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 {
@@@ -128,30 -115,10 +128,30 @@@
      $ca= sub {
        my ($s,$ss) = @_;
  #print "ca($s)\n";
 -      if ($s !~ m/\%(\w+)/) { $commods{ucfirst $s} .= $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); }
@@@ -176,7 -143,7 +176,7 @@@
  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) {
@@@ -218,7 -185,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) = @_;
@@@ -228,7 -195,7 +228,7 @@@
  
  sub parse_pctb_commodmap () {
      undef %pctb_commodmap;
 -    foreach my $commod (keys %commods) { $commods{$commod} =~ s/b//; }
 +    foreach my $commod (keys %commods) { $commods{$commod}{Srcs} =~ s/b//; }
  
      my $c= new IO::File '_commodmap.tsv';
      if (!$c) { $!==&ENOENT or die $!; return 0; }
@@@ -237,7 -204,7 +237,7 @@@
        m/^(\S.*\S)\t(\d+)\n$/ or die "$_";
        die if defined $pctb_commodmap{$1};  $pctb_commodmap{$1}= $2;
        die if defined $pctb_commodmap[$2];  $pctb_commodmap[$2]= $1;
 -      $commods{$1} .= 'b';
 +      $commods{$1}{Srcs} .= 'b';
      }
      $c->error and die $!;
      close $c or die $!;
@@@ -247,7 -214,7 +247,7 @@@
  sub get_our_version ($$) {
      my ($aref,$prefix) = @_;
      $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
-     $aref->{"${prefix}fixes"}= 'lastpage';
+     $aref->{"${prefix}fixes"}= 'lastpage checkpager';
  
      my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?;
      chomp($version);
@@@ -265,7 -232,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;
@@@ -391,8 -357,4 +391,8 @@@ sub cgi_get_caller () 
      return $caller;
  }
  
 +sub set_ctype_utf8 () {
 +    setlocale(LC_CTYPE, "en.UTF-8");
 +}
 +
  1;

diff --combined yarrg/commod-update-receiver
index 4ae267d9b41d3ce78e217b3d74164a0c6feda09a,9558d387892c9f1a1732c52fad64e6deef1245d0..9684c696794996c527c44e2d051747652230ffe6
--- 1/yarrg/commod-update-receiver
--- 2/yarrg/commod-update-receiver
+++ b/yarrg/commod-update-receiver
@@@ -35,7 -35,7 +35,7 @@@ $CGI::POST_MAX= 3*1024*1024
  
  use CGI qw/:standard -private_tempfiles/;
  
 -setlocale(LC_CTYPE, "en_GB.UTF-8");
 +set_ctype_utf8();
  
  our $now= time;  defined $now or die $!;
  
@@@ -49,7 -49,7 +49,7 @@@ sub fail ($) 
      print header(-status=>'400 Bad commodity update',
                 -type=>'text/plain',
                 -charset=>'us-ascii');
-     print "Error: $msg\n";
+     print "\nError: $msg\n";
      exit 0;
  }