fixed bug: csv-find -trimspace issue #2

Author: rsdoiel

cmds/csvfind/csvfind.go

@@ -33,7 +33,7 @@ import (
 var (
 	description = `
 %s processes a CSV file as input returning rows that contain the column
-with matched text. Columns are count from one instead of zero. Supports 
+with matched text. Columns are counted from one instead of zero. Supports 
 exact match as well as some Levenshtein matching.
 `
 
@@ -42,7 +42,7 @@ Find the rows where the third column matches "The Red Book of Westmarch" exactly
 
     %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 
+Find the rows where the third column (colums numbered 1,2,3) matches approximately 
 "The Red Book of Westmarch"
 
     %s -i books.csv -col=2 -levenshtein \
@@ -123,7 +123,7 @@ func main() {
 	app.StringVar(&stopWordsOption, "stop-words", "", "use the colon delimited list of stop words")
 	app.BoolVar(&skipHeaderRow, "skip-header-row", true, "skip the header row")
 	app.BoolVar(&allowDuplicates, "allow-duplicates", true, "allow duplicates when searching for matches")
-	app.BoolVar(&trimSpaces, "trimspaces", false, "trim spaces around cell values before comparing")
+	app.BoolVar(&trimSpaces, "trimspace,trimspaces", false, "trim spaces around cell values before comparing")
 
 	// Parse env and options
 	app.Parse()
@@ -214,6 +214,9 @@ func main() {
 				if caseSensitive == false {
 					src = strings.ToLower(src)
 				}
+				if trimSpaces == true {
+					src = strings.TrimSpace(src)
+				}
 				if len(stopWords) > 0 {
 					// Split into fields applying datatools filter
 					fields := strings.FieldsFunc(src, func(c rune) bool {

how-to/csvfind/trimspace.csv

@@ -0,0 +1,4 @@
+name,location,information
+red,library,color
+blue, field,classification
+ yellow ,house,paint

test_cmds.bash

@@ -437,6 +437,24 @@ function test_csvfind() {
     R=$(cmp how-to/csvfind/result3.csv temp.csv)
     assert_empty "test_csvfind (contains)" "$R"
 
+    # csvfind -trimspaces issue #2
+    E="red,library,color"
+    R=$(bin/csvfind -nl=false -i how-to/csvfind/trimspace.csv -col=2 -trimspaces "library")
+    assert_equal "test_csvfind (trimspaces library)" "$E" "$R"
+
+    E="red,library,color"
+    R=$(bin/csvfind -nl=false -i how-to/csvfind/trimspace.csv -col=1 -trimspaces "red")
+    assert_equal "test_csvfind (trimspaces red)" "$E" "$R"
+
+    E='blue," field",classification'
+    R=$(bin/csvfind -nl=false -i how-to/csvfind/trimspace.csv -col=2 -trimspaces "field")
+    assert_equal "test_csvfind (trimspaces field)" "$E" "$R"
+
+    E='" yellow ",house,paint'
+    R=$(bin/csvfind -nl=false -i how-to/csvfind/trimspace.csv -col=1 -trimspaces "yellow")
+    assert_equal "test_csvfind (trimspaces yellow)" "$E" "$R"
+
+
     if [ -f temp.csv ]; then rm temp.csv; fi
     echo "test_csvfind OK";
 }