From 34be8e5d121442f3a0a51a5b645de85b8acf643b Mon Sep 17 00:00:00 2001
From: rich <rich>
Date: Fri, 21 Apr 2006 12:44:42 +0000
Subject: [PATCH] Fixed a fairly grave bug in Csv.print_readable - one of those
 surprised it ever worked bugs.  Affected bidding - now fixed.

---
 csv.ml | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/csv.ml b/csv.ml
index efb1bc0..82d8d02 100644
--- a/csv.ml
+++ b/csv.ml
@@ -1,6 +1,6 @@
 (* csv.ml - comma separated values parser
  *
- * $Id: csv.ml,v 1.9 2006-02-23 15:24:25 rich Exp $
+ * $Id: csv.ml,v 1.10 2006-04-21 12:44:42 rich Exp $
  *)
 
 (* The format of CSV files:
@@ -40,6 +40,8 @@
  * subset of it into a matrix.
  *)
 
+open Printf
+
 type t = string list list
 
 exception Bad_CSV_file of string
@@ -369,18 +371,18 @@ let save_out_readable chan csv =
 
     match csv with
       | [] -> []
-      | r :: _ ->
-	  let n = List.length r in
-	  let lengths = List.map (List.map String.length) csv in
+      | row1 :: rest ->
+	  let lengths_row1 = List.map String.length row1 in
+	  let lengths_rest = List.map (List.map String.length) rest in
 	  let max2rows r1 r2 =
-	    let rp = List.combine r1 r2 in
+	    let rp =
+	      try List.combine r1 r2
+	      with
+		Invalid_argument "List.combine" ->
+		  failwith "Csv.save_out_readable: internal error: length r1 = %d, length r2 = %d" (List.length r1) (List.length r2) in
 	    List.map (fun ((a : int), (b : int)) -> max a b) rp
 	  in
-	  let rec repeat x = function
-	    | 0 -> []
-	    | i -> x :: repeat x (i-1)
-	  in
-	  List.fold_left max2rows (repeat 0 n) lengths in
+	  List.fold_left max2rows lengths_row1 lengths_rest in
 
   (* Print out each cell at the correct width. *)
   let rec repeat f = function
@@ -393,9 +395,17 @@ let save_out_readable chan csv =
 	output_string chan cell;
 	output_char chan '\n'
     | row ->				(* Other. *)
-	let row = List.combine widths row in
+	(* Pair up each cell with its max width. *)
+	let row =
+	  let rec loop = function
+	    | ([], _) -> []
+	    | (_, []) -> failwith "Csv.save_out_readable: internal error"
+	    | (cell :: cells, width :: widths) ->
+		(cell, width) :: loop (cells, widths)
+	  in
+	  loop (row, widths) in
 	List.iter (
-	  fun (width, cell) ->
+	  fun (cell, width) ->
 	    output_string chan cell;
 	    let n = String.length cell in
 	    repeat (fun () -> output_char chan ' ') (width - n + 1)
-- 
1.8.3.1