cli option for columns now counts first column as 1 rather than zero

Author: rsdoiel

cmds/csvcols/csvcols.go

@@ -43,7 +43,7 @@ SYNOPSIS
 
 %s converts a set of command line args into columns output in CSV format.
 It can also be used to filter input CSV and rendering only the column numbers
-listed on the commandline.
+listed on the commandline (first column is 1 not 0)
 `
 
 	examples = `
@@ -61,13 +61,13 @@ Example parsing a pipe delimited string into a CSV line
     %s -delimiter "|" "1|2|3" >> 3col.csv
     cat 3col.csv
 
-Filter a 10 column CSV file for columns 0,3,5 (left most column is number zero)
+Filter a 10 column CSV file for columns 1,4,6 (left most column is number zero)
 
-    cat 10col.csv | csvcols -col 0 3 5 > 3col.csv
+    cat 10col.csv | csvcols -col 1 4 6 > 3col.csv
 
-Filter a 10 columns CSV file for columns 0,3,5 from input file
+Filter a 10 columns CSV file for columns 1,4,6 from input file
 
-    %s -i 10col.csv -col 0 3 5 > 3col.csv
+    %s -i 10col.csv -col 1 4 6 > 3col.csv
 `
 
 	// Standard Options
@@ -187,8 +187,13 @@ func main() {
 		columnNos := []int{}
 		for _, arg := range args {
 			i, err := strconv.Atoi(arg)
+			// NOTE: We need to adjust from humans counting from 1 to counting from zero
+			i--
+			if i < 0 {
+				i = 0
+			}
 			if err != nil {
-				fmt.Fprintf(os.Stderr, "Expected a column number (0 - n), %q, %s\n", arg, err)
+				fmt.Fprintf(os.Stderr, "Expected a column number in range of 1 to N, %q, %s\n", arg, err)
 				os.Exit(1)
 			}
 			columnNos = append(columnNos, i)

cmds/csvfind/csvfind.go

@@ -39,20 +39,21 @@ var (
 SYNOPSIS
 
 %s processes a CSV file as input returning rows that contain the column
-with matched text. Supports exact match as well as some Levenshtein matching.
+with matched text. Columns are count from one instead of zero. Supports 
+exact match as well as some Levenshtein matching.
 `
 
 	examples = `
 EXAMPLES
 
 Find the rows where the third column matches "The Red Book of Westmarch" exactly
 
-    %s -i books.csv -col=1 "The Red Book of Westmarch"
+    %s -i books.csv -col=2 "The Red Book of Westmarch"
 
 Find the rows where the third column (colums numbered 0,1,2) matches approximately 
 "The Red Book of Westmarch"
 
-    %s -i books.csv -col=1 -levenshtein \
+    %s -i books.csv -col=2 -levenshtein \
        -insert-cost=1 -delete-cost=1 -substitute-cost=3 \
        -max-edit-distance=50 -append-edit-distance \
        "The Red Book of Westmarch"
@@ -61,7 +62,7 @@ In this example we've appended the edit distance to see how close the matches ar
 
 You can also search for phrases in columns.
 
-    %s -i books.csv -col=1 -contains "Red Book"
+    %s -i books.csv -col=2 -contains "Red Book"
 `
 
 	// Standard Options
@@ -141,10 +142,11 @@ func main() {
 		os.Exit(0)
 	}
 
-	if col < 0 {
-		fmt.Fprintf(os.Stderr, "Cannot have a negative column reference %d\n", col)
+	if col <= 0 {
+		fmt.Fprintf(os.Stderr, "Cannot have a zero or negative column reference %d\n", col)
 		os.Exit(1)
 	}
+	col = col - 1
 
 	args := flag.Args()
 	if len(args) == 0 {

cmds/csvjoin/csvjoin.go

@@ -40,7 +40,7 @@ SYNOPSIS
 
 %s outputs CSV content based on two CSV files with matching column values.
 Each CSV input file has a designated column to match on. The values are
-compared as strings.
+compared as strings. Columns are counted from one rather than zero.
 `
 
 	examples = `
@@ -51,8 +51,8 @@ and data2.csv where column 1 in data1.csv matches the value in
 column 3 of data2.csv with the results being written to 
 merged-data.csv..
 
-    %s -csv1=data1.csv -col1=1 \
-       -csv2=data2.csv -col2=3 \
+    %s -csv1=data1.csv -col1=2 \
+       -csv2=data2.csv -col2=4 \
        -output=merged-data.csv
 `
 
@@ -196,6 +196,18 @@ func main() {
 		os.Exit(0)
 	}
 
+	// NOTE: We are counting columns for humans from 1 rather than zero.
+	if col1 <= 0 {
+		fmt.Fprintf(os.Stderr, "col1 must be one or greater, %d\n", col1)
+		os.Exit(1)
+	}
+	if col2 <= 0 {
+		fmt.Fprintf(os.Stderr, "col2 must be one or greater, %d\n", col2)
+		os.Exit(1)
+	}
+	col1--
+	col2--
+
 	// NOTE: we don't setup inputFName as we need at least two inputs to process the join.
 	out, err := cli.Create(outputFName, os.Stdout)
 	if err != nil {