added useCRLF option to better support Windows, see issue #24

Author: R. S. Doiel

cmd/csv2tab/csv2tab.go

@@ -10,6 +10,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime"
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/datatools"
@@ -89,6 +90,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF := (runtime.GOOS == "windows")
 
 	flag.BoolVar(&showHelp, "h", false, "display help")
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -100,6 +102,7 @@ func main() {
 	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")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "use a CRLF for end of line (EOL)")
 
 	// Parse Environment and Options
 	flag.Parse()
@@ -133,6 +136,7 @@ func main() {
 	exitCode := 0
 	w := csv.NewWriter(out)
 	w.Comma = '\t'
+	w.UseCRLF = useCRLF
 	/*
 		if delimiter != "" {
 			w.Comma = datatools.NormalizeDelimiterRune(delimiter)

cmd/csvcleaner/csvcleaner.go

@@ -24,6 +24,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 
 	// Caltech Library Packages
@@ -113,7 +114,6 @@ minimal memory is used to operate on the file.
 -use-lazy-quotes
 : use lazy quotes for CSV input
 
-
 # EXAMPLES
 
 Normalizing a spread sheet's column count to 5 padding columns as needed per row.
@@ -180,6 +180,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF = (runtime.GOOS == "windows")
 
 	// Standard options
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -202,7 +203,7 @@ func main() {
 	flag.StringVar(&comma, "comma", "", "if set use this character in place of a comma for delimiting cells")
 	flag.StringVar(&rowComment, "comment-char", "", "if set, rows starting with this character will be ignored as comments")
 	flag.StringVar(&commaOut, "output-comma", "", "if set use this character in place of a comma for delimiting output cells")
-	flag.BoolVar(&useCRLF, "use-crlf", false, "if set use a charage return and line feed in output")
+	flag.BoolVar(&useCRLF, "use-crlf", useCRLF, "if set use a charage return and line feed in output")
 	flag.BoolVar(&stopOnError, "stop-on-error", false, "exit on error, useful if you're trying to debug a problematic CSV file")
 	flag.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quotes for CSV input")
 	flag.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trim leading space from field(s) for CSV input")

cmd/csvcols/csvcols.go

@@ -24,6 +24,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 
 	// Caltech Library packages
@@ -94,6 +95,8 @@ listed on the commandline (first column is 1 not 0).
 -uuid
 : add a prefix row with generated UUID cell
 
+-crlf
+: use a CRLF for end of line (EOL) on output (defualts to true on Windows)
 
 # EXAMPLES
 
@@ -149,6 +152,7 @@ Using options filter a 3 column CSV file for columns 1,3 into 2col.csv
 	outputDelimiter  string
 	lazyQuotes       bool
 	trimLeadingSpace bool
+	useCRLF          bool
 )
 
 
@@ -185,6 +189,7 @@ func CSVColumns(in *os.File, out *os.File, eout *os.File, columnNos []int, prefi
 	r.TrimLeadingSpace = trimLeadingSpace
 
 	w := csv.NewWriter(out)
+	w.UseCRLF = useCRLF
 	if delimiterIn != "" {
 		r.Comma = datatools.NormalizeDelimiterRune(delimiterIn)
 	}
@@ -222,6 +227,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF = (runtime.GOOS == "windows")
 
 	// Standard Options
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -245,6 +251,7 @@ func main() {
 	flag.BoolVar(&prefixUUID, "uuid", false, "add a prefix row with generated UUID cell")
 	flag.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quotes on CSV input")
 	flag.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trim leading space in field(s) for CSV input")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "use a CRLF for end of line (EOL)")
 
 	// Parse env and options
 	flag.Parse()
@@ -320,6 +327,7 @@ func main() {
 	}
 
 	w := csv.NewWriter(out)
+	w.UseCRLF = useCRLF
 	if outputDelimiter != "" {
 		w.Comma = datatools.NormalizeDelimiterRune(outputDelimiter)
 	}

cmd/csvfind/csvfind.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 
 	// Caltech Library packages
@@ -94,7 +95,10 @@ zero. Supports exact match as well as some Levenshtein matching.
 : set the edit distance thresh hold for match, default 0
 
 -nl, -newline
-: include trailing newline from output
+: include trailing newline from output for end of file (EOF)
+
+-crlf
+: use CRLF for end of line (EOL) on write, defaults to true for Windows
 
 -o, -output
 : output filename
@@ -182,6 +186,7 @@ You can also search for phrases in columns.
 	delimiter          string
 	lazyQuotes         bool
 	trimLeadingSpace   bool
+	useCRLF            bool
 )
 
 func main() {
@@ -190,6 +195,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF = (runtime.GOOS == "windows")
 
 	// Basic Options
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -224,6 +230,7 @@ func main() {
 	flag.BoolVar(&trimSpaces, "trimspaces", false, "trim spaces around cell values before comparing")
 	flag.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quotes on CSV input")
 	flag.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trim leadings space in field(s) for CSV input")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "use CRLF for end of line (EOL) on write")
 
 	// Parse env and options
 	flag.Parse()
@@ -300,6 +307,7 @@ func main() {
 	csvIn.LazyQuotes = lazyQuotes
 	csvIn.TrimLeadingSpace = trimLeadingSpace
 	csvOut := csv.NewWriter(out)
+	csvOut.UseCRLF = useCRLF
 	if delimiter != "" {
 		csvIn.Comma = datatools.NormalizeDelimiterRune(delimiter)
 		csvOut.Comma = datatools.NormalizeDelimiterRune(delimiter)

cmd/csvjoin/csvjoin.go

@@ -23,6 +23,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 
 	// My packages
@@ -120,6 +121,9 @@ rather than zero.
 -use-lazy-quotes
 : use lazy quotes for CSV input
 
+-crlf
+: use CRLF for end of line (EOL) on write, defaults to true on Windows
+
 -verbose
 : output processing count to stderr
 
@@ -171,6 +175,7 @@ merged-data.csv..
 	delimiter        string
 	lazyQuotes       bool
 	trimLeadingSpace bool
+	useCRLF          bool
 )
 
 
@@ -249,6 +254,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF = (runtime.GOOS == "windows")
 
 	// Standard Options
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -280,6 +286,7 @@ func main() {
 	flag.StringVar(&delimiter, "delimiter", "", "set delimiter character")
 	flag.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quotes for CSV input")
 	flag.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trim leading space in field(s) for CSV input")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "use CRLF for end of line (EOL) on write")
 
 	// Parse env and options
 	flag.Parse()
@@ -370,6 +377,7 @@ func main() {
 	csv2.TrimLeadingSpace = trimLeadingSpace
 
 	w := csv.NewWriter(out)
+	w.UseCRLF = useCRLF
 	if delimiter != "" {
 		csv1.Comma = datatools.NormalizeDelimiterRune(delimiter)
 		csv2.Comma = datatools.NormalizeDelimiterRune(delimiter)

cmd/csvrows/csvrows.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 
 	// Caltech Library packages
@@ -95,6 +96,8 @@ and {app_name} makes it easy to output only the data rows.
 -use-lazy-quotes
 : use lazy quotes for CSV input
 
+-crlf
+: use a CRLF for end of line (EOL) on write, defaults to true on Windows
 
 # EXAMPLES
 
@@ -159,6 +162,7 @@ a header row from 10row.csv.
 	randomRows       int
 	lazyQuotes       bool
 	trimLeadingSpace bool
+	useCRLF          bool
 )
 
 func main() {
@@ -167,6 +171,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF = (runtime.GOOS == "windows")
 
 	// Standard options
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -189,6 +194,7 @@ func main() {
 	flag.IntVar(&randomRows, "random", 0, "return N randomly selected rows")
 	flag.BoolVar(&lazyQuotes, "use-lazy-quotes", false, "use lazy quotes for CSV input")
 	flag.BoolVar(&trimLeadingSpace, "trim-leading-space", false, "trim leading space in field(s) for CSV input")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "use a CRLF for end of line (EOL) on write")
 
 	// Parse env and options
 	flag.Parse()
@@ -276,6 +282,7 @@ func main() {
 
 	// Clean up cells removing outer quotes if necessary
 	w := csv.NewWriter(out)
+	w.UseCRLF = useCRLF
 	if delimiter != "" {
 		w.Comma = datatools.NormalizeDelimiterRune(delimiter)
 	}

cmd/jsoncols/jsoncols.go

@@ -14,6 +14,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"runtime"
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/datatools"
@@ -69,7 +70,10 @@ extracted is a comma. This can be overridden with an option.
 : input filename
 
 -nl, -newline
-: if true add a trailing newline
+: if true add a trailing newline for end of file (EOF)
+
+-crlf
+: use CRLF for CSV writes, defaults to true on Windows
 
 -o, -output
 : output filename
@@ -156,6 +160,7 @@ Would yield
 	delimiter      = ","
 	expressions    []string
 	quote          bool
+	useCRLF        bool
 )
 
 
@@ -170,6 +175,7 @@ func main() {
 	license := datatools.LicenseText
 	releaseDate := datatools.ReleaseDate
 	releaseHash := datatools.ReleaseHash
+	useCRLF = (runtime.GOOS == "windows")
 
 	// Basic Options
 	flag.BoolVar(&showHelp, "help", false, "display help")
@@ -193,6 +199,7 @@ func main() {
 	flag.BoolVar(&quote, "quote", true, "quote strings and JSON notation")
 	flag.BoolVar(&prettyPrint, "p", false, "pretty print JSON output")
 	flag.BoolVar(&prettyPrint, "pretty", false, "pretty print JSON output")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "use a CRLF for end of line (EOL) on CSV write")
 
 	// Parse Environment and Options
 	flag.Parse()
@@ -294,6 +301,7 @@ func main() {
 
 		// Setup the CSV output
 		w := csv.NewWriter(out)
+		w.UseCRLF = useCRLF
 		if delimiter != "" {
 			w.Comma = datatools.NormalizeDelimiterRune(delimiter)
 		}

cmd/sql2csv/sql2csv.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"runtime"
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/datatools"
@@ -113,9 +114,10 @@ configuration file
 -delimiter
 : Set the delimiter to use, default is comma
 
--use-cdlf
+-use-crlf, -crlf
 : Force the line ending per row to carage return and
-line feed if true, false use line feed
+line feed if true, false use line feed. Defaults to true
+on Windows, false otherwise.
 
 -sql FILENAME
 : Read sql statement from a file instead of the command line.
@@ -156,7 +158,7 @@ func main() {
 	sqlCfg := new(datatools.SQLCfg)
 	sqlCfg.Delimiter = ","
 	sqlCfg.WriteHeaderRow = true
-	sqlCfg.UseCRLF = false
+	sqlCfg.UseCRLF = (runtime.GOOS == "windows")
 
 	// Running details
 	appName := path.Base(os.Args[0])
@@ -177,6 +179,7 @@ func main() {
 	flag.BoolVar(&showVersion, "version", showVersion, "display version")
 	flag.BoolVar(&writeHeaderRow, "header-row", writeHeaderRow, "write a header row if true")
 	flag.BoolVar(&useCRLF, "use-crlf", useCRLF, "delimited rows with a carriage return and line feed")
+	flag.BoolVar(&useCRLF, "crlf", useCRLF, "delimited rows with a carriage return and line feed")
 	flag.StringVar(&dsn, "dsn", dsn, "connect using the data source name provided in URL form")
 	flag.StringVar(&delimiter, "delimiter", "", "set the delimiter, defaults to comma")
 	flag.StringVar(&sqlFName, "sql", "", "read the SQL statement from a file, '-' will cause a read from standard input")