From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 31 Oct 2009 20:32:21 +0000 (+0000)
Subject: Merge branch 'stable-5.x'
X-Git-Tag: 6.0~24
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=e85ef56a3b2eff647efc77e44ba5ba0a19e53393

Merge branch 'stable-5.x'
---

e85ef56a3b2eff647efc77e44ba5ba0a19e53393
diff --cc yarrg/commod-results-processor
index 9525330,37484d6..8ede371
--- a/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'};