Merge branch 'stable-5.x'

diff --cc yarrg/Commods.pm
Simple merge

diff --cc yarrg/TODO
Simple merge

diff --cc yarrg/commod-results-processor
index 9525330652b02051e35921a7feae25789faafce7,37484d6ef6ff071172036578b55a1eef3d2bb301..8ede37166a7c1215731769ccab8993437259634d
--- 1/yarrg/commod-results-processor
--- 2/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@@ -63,8 -64,11 +64,12 @@@ while (<>) 
      chomp;
      @v= split /\t/;
  #print STDERR "[".join("|",@v)."]\n";
+     foreach (@v[2..$#v]) {
+       s/\,//g;
+       die "$_ ?" if m/.\D/;
+     }
      ($commod,$stall) = @v;
 +    push @commods_inorder, $commod unless exists $commod{$commod};
      bs_read(Buy,  2);
      bs_read(Sell, 4);
      $commod{$commod}{Hold}= $v[6]+0 if @v>6;
@@@ -224,44 -231,9 +232,44 @@@ sub write_tsv ($$) 
  }
  
  sub main__tsv () {
-     write_tsv(\*STDOUT);
+     write_tsv(\*STDOUT,1);
  }
  
 +sub undef_printable { my ($ov)= @_; defined $ov ? $ov : '?'; };
 +
 +sub commodsinorder_print1 ($$) {
 +    my ($keyword,$commod) = @_;
 +    printf("%s\t%-40s %10s %s",
 +         $keyword,
 +         $commod,
 +         undef_printable($commods{$commod}{Ordval}),
 +         undef_printable($commods{$commod}{Class}))
 +      or die $!;
 +}
 +
 +sub main__commodsinorder () {
 +    parse_info_serverside();
 +    my $last_ov;
 +    foreach my $commod (@commods_inorder) {
 +      my $ov= $commods{$commod}{Ordval};
 +      commodsinorder_print1('found',$commod);
 +      if (defined $ov) {
 +          if (defined $last_ov && $ov <= $last_ov) {
 +              print " out-of-order" or die $!;
 +          }
 +          $last_ov= $ov;
 +      }
 +      print "\n" or die $!;
 +    }
 +    foreach my $commod (sort {
 +          undef_printable($commods{$a}{Ordval}) cmp
 +          undef_printable($commods{$b}{Ordval})
 +      } keys %commods) {
 +      next if exists $commod{$commod};
 +      commodsinorder_print1('none',$commod);
 +      print "\n" or die $!;
 +    }
 +}
  
  our ($pctb) = $ENV{'YPPSC_YARRG_PCTB'};
  

diff --cc yarrg/update-master-info
Simple merge