From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 24 Jan 2011 15:38:11 +0000 (+0000)
Subject: Revert "canon: by price only, not stall"
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=88eef8ccfad5a5e776ede47499f96e50ae981abd;p=ypp-sc-tools.main.git

Revert "canon: by price only, not stall"

This reverts commit f3211a17dd15c4dd3d0e54663d7c2b37e8542184.
---

diff --git a/yarrg/canon b/yarrg/canon
index 182fa32..cb6b980 100755
--- a/yarrg/canon
+++ b/yarrg/canon
@@ -7,9 +7,9 @@ foreach my $ab (qw(0 1)) {
         my @l= split /\t/, $_;
         next unless length $l[2];
         $l[3]='1001' if $l[3] eq '>1000';
-        my $k= sprintf "%5d\t%-23s", $l[2], $l[0];
-        $s{$k} ||= [ 0,0 ];
-        $s{$k}[$ab]= $l[3];
+        my $k= sprintf "%-23s\t%-31s", $l[0], $l[1];
+        $s{$k}[$ab*2]= $l[2];
+        $s{$k}[$ab*2+1]= $l[3];
     }
     close F or die $!;
 }
@@ -18,8 +18,9 @@ foreach my $k (sort keys %s) {
     my @r= @{ $s{$k} };
     my $whynot=
         !defined($r[0]) ? 'ADD' :
-        !defined($r[1]) ? 'DEL' :
-        $r[0] != $r[1] ? (sprintf "qt %4d",($r[1]-$r[0])) :
+        !defined($r[2]) ? 'DEL' :
+        $r[0] != $r[2] ? 'pri' :
+        $r[1] != $r[3] ? (sprintf "qt %4d",($r[3]-$r[1])) :
         undef;
     next unless $whynot;
     print $whynot,"\t",$k;