X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fcommod-results-processor;h=8ede37166a7c1215731769ccab8993437259634d;hp=9525330652b02051e35921a7feae25789faafce7;hb=024f4a767b43a66e6ff004532f039b874e401b80;hpb=3f93cfabd49eeaaca06358f87d9324a5b2e6c211

diff --git a/yarrg/commod-results-processor b/yarrg/commod-results-processor
index 9525330..8ede371 100755
--- a/yarrg/commod-results-processor
+++ b/yarrg/commod-results-processor
@@ -51,6 +51,7 @@ sub bs_read ($$) {
     return if @v <= $c;
     my ($price,$qty) = @v[$c..$c+1];
     return if !length($price) && !length($qty);
+    die "$price ?" unless $price =~ m/^\d/;
     die "$_ ?" unless length($price) && length($qty);
     $commod{$commod}{$bs}{$stall}= {
 	Stall => $stall,
@@ -63,6 +64,10 @@ 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);
@@ -205,8 +210,8 @@ sub bs_p_tsv ($$) {
     }
 }
 
-sub write_tsv ($) {
-    my ($f) = @_;
+sub write_tsv ($$) {
+    my ($f,$showhold) = @_;
     foreach $commod (sort keys %commod) {
 	$current= $commod{$commod};
 	my %stalls;
@@ -216,6 +221,9 @@ sub write_tsv ($) {
 	    printf($f "%s\t%s", $commod, $stall) or die $!;
 	    bs_p_tsv($f, Buy);
 	    bs_p_tsv($f, Sell);
+	    if ($showhold && $commod{$commod}{Hold}) {
+		printf($f "\t%s", $commod{$commod}{Hold}) or die $!;
+	    }
 	    print($f "\n") or die $!;
 	}
     }
@@ -224,7 +232,7 @@ sub write_tsv ($) {
 }
 
 sub main__tsv () {
-    write_tsv(\*STDOUT);
+    write_tsv(\*STDOUT,1);
 }
 
 sub undef_printable { my ($ov)= @_; defined $ov ? $ov : '?'; };
@@ -485,7 +493,7 @@ sub main__uploadyarrg () {
     $o{'timestamp'}= $ENV{'YPPSC_DATA_TIMESTAMP'} or die;
 
     my $tf= pipethrough_prep();
-    write_tsv($tf);
+    write_tsv($tf,0);
     my $oz= pipethrough_run_gzip($tf);
     $o{'data'}=  [ undef, 'deduped.tsv.gz',
 		    Content_Type => 'application/octet-stream',