improved CSV reader options

Author: rsdoiel

cmd/csv2json/csv2json.go

@@ -71,6 +71,8 @@ Convert data1.csv to JSON blobs, one line per blob
 	delimiter        string
 	lazyQuotes       bool
 	trimLeadingSpace bool
+	fieldsPerRecord  int
+	reuseRecord      bool
 )
 
 func main() {
@@ -100,6 +102,8 @@ func main() {
 	app.StringVar(&delimiter, "d,delimiter", "", "set the delimter character")
 	app.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quotes for for CSV input")
 	app.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trim leading space in fields for CSV input")
+	app.BoolVar(&reuseRecord, "reuse-record", false, "reuse the backing array")
+	app.IntVar(&fieldsPerRecord, "fields-per-record", 0, "Set the number of fields expected in the CSV read, -1 to turn off")
 
 	// Parse environment and options
 	app.Parse()
@@ -150,8 +154,11 @@ func main() {
 	rowNo := 0
 	fieldNames := []string{}
 	r := csv.NewReader(app.In)
+	r.Comment = '#'
+	r.FieldsPerRecord = fieldsPerRecord
 	r.LazyQuotes = lazyQuotes
 	r.TrimLeadingSpace = trimLeadingSpace
+	r.ReuseRecord = reuseRecord
 	if delimiter != "" {
 		r.Comma = datatools.NormalizeDelimiterRune(delimiter)
 	}

cmd/tab2csv/tab2csv.go

@@ -49,10 +49,10 @@ This would yield
 	showVersion bool
 
 	// CSV Reader Options
-	lazyQuotes        bool
-	trimLeadingSpaces bool
-	reuseRecord       bool
-	fieldsPerRecord   int
+	lazyQuotes       bool
+	trimLeadingSpace bool
+	reuseRecord      bool
+	fieldsPerRecord  int
 )
 
 func main() {
@@ -65,8 +65,8 @@ func main() {
 
 	// CSV Reader options
 	flag.IntVar(&fieldsPerRecord, "fields-per-record", 0, "sets the number o fields expected in each row, -1 turns this off")
-	flag.BoolVar(&lazyQuotes, "lazy-quotes", false, "use lazy quoting for reader")
-	flag.BoolVar(&trimLeadingSpaces, "left-trim", false, "trims leading space read")
+	flag.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quoting for reader")
+	flag.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trims leading space read")
 	flag.BoolVar(&reuseRecord, "reuse-record", false, "re-uses the backing array on reader")
 
 	// Parse Environment and Options
@@ -92,7 +92,7 @@ func main() {
 	r.Comment = '#'
 	r.FieldsPerRecord = fieldsPerRecord
 	r.LazyQuotes = lazyQuotes
-	r.TrimLeadingSpace = trimLeadingSpaces
+	r.TrimLeadingSpace = trimLeadingSpace
 	r.ReuseRecord = reuseRecord
 
 	exitCode := 0