The test cases are Windows-oriented.
Fix it so that it will run properly on Linux.
James 2020
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/ab.test csvfix-new/csvfix/tests/correct/ab.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/ab.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/ab.test 2020-01-23 01:56:38.586604809 +1000
@@ -1,7 +1,7 @@
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/atable.test csvfix-new/csvfix/tests/correct/atable.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/atable.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/atable.test 2020-01-23 01:56:38.586604809 +1000
@@ -1,22 +1,22 @@
-+-------+------+-----------+
-| name | rank | serial_no |
-+-------+------+-----------+
-| jones | sgt | 12345 |
-| smith | maj | 34342 |
-| black | maj | 56431 |
-| white | pvt | 17139 |
-| pink | pvt | 67543 |
-+-------+------+-----------+
-+-------+------+-----------+
-| name | rank | serial_no |
-+-------+------+-----------+
-| jones | sgt | 12345 |
-+-------+------+-----------+
-| smith | maj | 34342 |
-+-------+------+-----------+
-| black | maj | 56431 |
-+-------+------+-----------+
-| white | pvt | 17139 |
-+-------+------+-----------+
-| pink | pvt | 67543 |
-+-------+------+-----------+
++-------+------+-----------+
+| name | rank | serial_no |
++-------+------+-----------+
+| jones | sgt | 12345 |
+| smith | maj | 34342 |
+| black | maj | 56431 |
+| white | pvt | 17139 |
+| pink | pvt | 67543 |
++-------+------+-----------+
++-------+------+-----------+
+| name | rank | serial_no |
++-------+------+-----------+
+| jones | sgt | 12345 |
++-------+------+-----------+
+| smith | maj | 34342 |
++-------+------+-----------+
+| black | maj | 56431 |
++-------+------+-----------+
+| white | pvt | 17139 |
++-------+------+-----------+
+| pink | pvt | 67543 |
++-------+------+-----------+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/block.test csvfix-new/csvfix/tests/correct/block.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/block.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/block.test 2020-01-23 01:56:38.586604809 +1000
@@ -1,6 +1,6 @@
-"NOT","1","one"
-"BLOCK","2","two"
-"BLOCK","3","three"
-"BLOCK","4","four"
-"NOT","5","five"
-"NOT","6","six"
+"NOT","1","one"
+"BLOCK","2","two"
+"BLOCK","3","three"
+"BLOCK","4","four"
+"NOT","5","five"
+"NOT","6","six"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/case.test csvfix-new/csvfix/tests/correct/case.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/case.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/case.test 2020-01-23 01:56:38.586604809 +1000
@@ -1,21 +1,21 @@
-"Charles","DICKENS","M"
-"Jane","AUSTEN","F"
-"Herman","MELVILLE","M"
-"Flann","O'BRIEN","M"
-"George","ELLIOT","F"
-"Virginia","WOOLF","F"
-"Oscar","WILDE","M"
-"Charles","dickens","M"
-"Jane","austen","F"
-"Herman","melville","M"
-"Flann","o'brien","M"
-"George","elliot","F"
-"Virginia","woolf","F"
-"Oscar","wilde","M"
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
+"Charles","DICKENS","M"
+"Jane","AUSTEN","F"
+"Herman","MELVILLE","M"
+"Flann","O'BRIEN","M"
+"George","ELLIOT","F"
+"Virginia","WOOLF","F"
+"Oscar","WILDE","M"
+"Charles","dickens","M"
+"Jane","austen","F"
+"Herman","melville","M"
+"Flann","o'brien","M"
+"George","elliot","F"
+"Virginia","woolf","F"
+"Oscar","wilde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/check.test csvfix-new/csvfix/tests/correct/check.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/check.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/check.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,2 +1,2 @@
-data/names.csv - OK
-data/birthdays.csv - OK
+data/names.csv - OK
+data/birthdays.csv - OK
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/dates.test csvfix-new/csvfix/tests/correct/dates.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/dates.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/dates.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,12 +1,12 @@
-"Jim","1980-12-01"
-"Pete","1964-04-23"
-"Ann","3/3/1878"
-"Bad","Not A Date"
-"Jim","1980-12-01"
-"Pete","1964-04-23"
-"Ann","3/3/1878"
-"Bad","Not A Date"
-"Peter","20-Aug-2000"
-"Jane","12-Feb-1970"
-"Bill","14-Jun-1971"
-"Anna","27-Dec-1976"
+"Jim","1980-12-01"
+"Pete","1964-04-23"
+"Ann","3/3/1878"
+"Bad","Not A Date"
+"Jim","1980-12-01"
+"Pete","1964-04-23"
+"Ann","3/3/1878"
+"Bad","Not A Date"
+"Peter","20-Aug-2000"
+"Jane","12-Feb-1970"
+"Bill","14-Jun-1971"
+"Anna","27-Dec-1976"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/diff.test csvfix-new/csvfix/tests/correct/diff.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/diff.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/diff.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,18 +1,18 @@
-"-","3","3","three"
-"+","5","6","six"
-"-","3","3","three"
-"+","3","7","seven"
-"-","3","7","seven"
-"+","3","3","three"
-"-","1","1","xxx","one"
-"+","1","1","foo","one"
-"-","2","2","xxx","two"
-"+","2","2","bar","two"
-"-","3","3","xxx","three"
-"+","3","3","zod","three"
-"-","1","1","xxx","one"
-"+","1","1","foo","one"
-"-","2","2","xxx","two"
-"+","2","2","bar","two"
-"-","3","3","xxx","three"
-"+","3","3","zod","three"
+"-","3","3","three"
+"+","5","6","six"
+"-","3","3","three"
+"+","3","7","seven"
+"-","3","7","seven"
+"+","3","3","three"
+"-","1","1","xxx","one"
+"+","1","1","foo","one"
+"-","2","2","xxx","two"
+"+","2","2","bar","two"
+"-","3","3","xxx","three"
+"+","3","3","zod","three"
+"-","1","1","xxx","one"
+"+","1","1","foo","one"
+"-","2","2","xxx","two"
+"+","2","2","bar","two"
+"-","3","3","xxx","three"
+"+","3","3","zod","three"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/echo.test csvfix-new/csvfix/tests/correct/echo.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/echo.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/echo.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,41 +1,41 @@
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"GB","United Kingdom"
-"FR","France"
-"DE","Germany"
-"NL","Netherlands"
-"IT","Italy"
-"US","United States"
-"London","GB"
-"Paris","FR"
-"Edinurgh","GB"
-"Amsterdam","NL"
-"Rome","IT"
-"Athens","GR"
-"Berlin","DE"
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"Charles"="Dickens"="M"
-"Jane"="Austen"="F"
-"Herman"="Melville"="M"
-"Flann"="O'Brien"="M"
-"George"="Elliot"="F"
-"Virginia"="Woolf"="F"
-"Oscar"="Wilde"="M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"GB","United Kingdom"
+"FR","France"
+"DE","Germany"
+"NL","Netherlands"
+"IT","Italy"
+"US","United States"
+"London","GB"
+"Paris","FR"
+"Edinurgh","GB"
+"Amsterdam","NL"
+"Rome","IT"
+"Athens","GR"
+"Berlin","DE"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"Charles"="Dickens"="M"
+"Jane"="Austen"="F"
+"Herman"="Melville"="M"
+"Flann"="O'Brien"="M"
+"George"="Elliot"="F"
+"Virginia"="Woolf"="F"
+"Oscar"="Wilde"="M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/edit.test csvfix-new/csvfix/tests/correct/edit.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/edit.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/edit.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,36 +1,36 @@
-"Charles","DickXXns","M"
-"Jane","AustXXn","F"
-"Herman","MXXlvillXX","M"
-"Flann","O'BriXXn","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","WildXX","M"
-"Charles","DickXXns","M"
-"Jane","AustXXn","F"
-"Herman","MXXlvillXX","M"
-"Flann","O'BriXXn","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","WildXX","M"
-"Charles","Dick/XXns","M"
-"Jane","Aust/XXn","F"
-"Herman","M/XXlvill/XX","M"
-"Flann","O'Bri/XXn","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wild/XX","M"
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"Charles","Dickens",":M:"
-"Jane","Austen",":F:"
-"Herman","Melville",":M:"
-"Flann","O'Brien",":M:"
-"George","Elliot",":F:"
-"Virginia","Woolf",":F:"
-"Oscar","Wilde",":M:"
-"Marc","Charbonneau"," "
+"Charles","DickXXns","M"
+"Jane","AustXXn","F"
+"Herman","MXXlvillXX","M"
+"Flann","O'BriXXn","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","WildXX","M"
+"Charles","DickXXns","M"
+"Jane","AustXXn","F"
+"Herman","MXXlvillXX","M"
+"Flann","O'BriXXn","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","WildXX","M"
+"Charles","Dick/XXns","M"
+"Jane","Aust/XXn","F"
+"Herman","M/XXlvill/XX","M"
+"Flann","O'Bri/XXn","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wild/XX","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"Charles","Dickens",":M:"
+"Jane","Austen",":F:"
+"Herman","Melville",":M:"
+"Flann","O'Brien",":M:"
+"George","Elliot",":F:"
+"Virginia","Woolf",":F:"
+"Oscar","Wilde",":M:"
+"Marc","Charbonneau"," "
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/erase.test csvfix-new/csvfix/tests/correct/erase.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/erase.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/erase.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,8 +1,8 @@
-"2","3"
-"1","3"
-"1","2"
-"1","","3"
-"foo"
-"foo"
-"foo"
-""
+"2","3"
+"1","3"
+"1","2"
+"1","","3"
+"foo"
+"foo"
+"foo"
+""
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/escape.test csvfix-new/csvfix/tests/correct/escape.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/escape.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/escape.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,21 +1,21 @@
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O''Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"Char\les","Dicke\ns","M"
-"Ja\ne","Auste\n","F"
-"Herma\n","Me\lvi\l\le","M"
-"F\la\n\n","O'Brie\n","M"
-"George","E\l\liot","F"
-"Virgi\nia","Woo\lf","F"
-"Oscar","Wi\lde","M"
-"Charles","Dicke\ns","M"
-"Jane","Auste\n","F"
-"Herman","Me\lvi\l\le","M"
-"Flann","O'Brie\n","M"
-"George","E\l\liot","F"
-"Virginia","Woo\lf","F"
-"Oscar","Wi\lde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O''Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"Char\les","Dicke\ns","M"
+"Ja\ne","Auste\n","F"
+"Herma\n","Me\lvi\l\le","M"
+"F\la\n\n","O'Brie\n","M"
+"George","E\l\liot","F"
+"Virgi\nia","Woo\lf","F"
+"Oscar","Wi\lde","M"
+"Charles","Dicke\ns","M"
+"Jane","Auste\n","F"
+"Herman","Me\lvi\l\le","M"
+"Flann","O'Brie\n","M"
+"George","E\l\liot","F"
+"Virginia","Woo\lf","F"
+"Oscar","Wi\lde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/evalextra.test csvfix-new/csvfix/tests/correct/evalextra.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/evalextra.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/evalextra.test 2020-01-23 01:56:38.589938143 +1000
@@ -1 +1 @@
-"1","-1","0","13","11"
+"1","-1","0","13","11"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/eval.test csvfix-new/csvfix/tests/correct/eval.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/eval.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/eval.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,30 +1,30 @@
-"1","17.0","9"
-"6","100","53"
-"3","42","22.5"
-"2","-1","0.5"
-"London","GB","London"
-"Paris","FR","Ignore"
-"Edinurgh","GB","Edinurgh"
-"Amsterdam","NL","Ignore"
-"Rome","IT","Ignore"
-"Athens","GR","Athens"
-"Berlin","DE","Ignore"
-"London","GB"
-"Ignore","FR"
-"Edinurgh","GB"
-"Ignore","NL"
-"Ignore","IT"
-"Athens","GR"
-"Ignore","DE"
-"1","17.0","-8"
-"6","100","-47"
-"3","42","-19.5"
-"2","-1","1.5"
-"-8"
-"-47"
-"-19.5"
-"1.5"
-"too small"
-"-47"
-"-19.5"
-"too small"
+"1","17.0","9"
+"6","100","53"
+"3","42","22.5"
+"2","-1","0.5"
+"London","GB","London"
+"Paris","FR","Ignore"
+"Edinurgh","GB","Edinurgh"
+"Amsterdam","NL","Ignore"
+"Rome","IT","Ignore"
+"Athens","GR","Athens"
+"Berlin","DE","Ignore"
+"London","GB"
+"Ignore","FR"
+"Edinurgh","GB"
+"Ignore","NL"
+"Ignore","IT"
+"Athens","GR"
+"Ignore","DE"
+"1","17.0","-8"
+"6","100","-47"
+"3","42","-19.5"
+"2","-1","1.5"
+"-8"
+"-47"
+"-19.5"
+"1.5"
+"too small"
+"-47"
+"-19.5"
+"too small"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/exclude.test csvfix-new/csvfix/tests/correct/exclude.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/exclude.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/exclude.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,21 +1,21 @@
-"Dickens"
-"Austen"
-"Melville"
-"O'Brien"
-"Elliot"
-"Woolf"
-"Wilde"
-"Charles","Dickens"
-"Jane","Austen"
-"Herman","Melville"
-"Flann","O'Brien"
-"George","Elliot"
-"Virginia","Woolf"
-"Oscar","Wilde"
-"Dickens","M"
-"Jane","Austen","F"
-"Melville","M"
-"Flann","O'Brien","M"
-"Elliot","F"
-"Woolf","F"
-"Oscar","Wilde","M"
+"Dickens"
+"Austen"
+"Melville"
+"O'Brien"
+"Elliot"
+"Woolf"
+"Wilde"
+"Charles","Dickens"
+"Jane","Austen"
+"Herman","Melville"
+"Flann","O'Brien"
+"George","Elliot"
+"Virginia","Woolf"
+"Oscar","Wilde"
+"Dickens","M"
+"Jane","Austen","F"
+"Melville","M"
+"Flann","O'Brien","M"
+"Elliot","F"
+"Woolf","F"
+"Oscar","Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/exec.test csvfix-new/csvfix/tests/correct/exec.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/exec.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/exec.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,16 +1,16 @@
-"Charles","Dickens","M","ChXrlXs DXckXns"
-"Jane","Austen","F","JXnX AXstXn"
-"Herman","Melville","M","HXrmXn MXlvXllX"
-"Flann","O'Brien","M","FlXnn O'BrXXn"
-"George","Elliot","F","GXXrgX EllXXt"
-"Virginia","Woolf","F","VXrgXnXX WXXlf"
-"Oscar","Wilde","M","OscXr WXldX"
-"Charles","Dickens","M","Dickens","Charles","Bleak House","Esther Sumerson","Drippy Heroine"
-"Charles","Dickens","M","Dickens","Charles","Bleak House","Inspector Bucket","Prototype detective"
-"Charles","Dickens","M","Dickens","Charles","Great Expectations","Pip","Deluded ex-blacksmith"
-"Charles","Dickens","M","Dickens","Charles","Bleak House","Mr Vholes","Vampiric lawyer"
-"Jane","Austen","F","Austen","Jane","Emma","Emma Woodhouse","Smug Surrey goddess"
-"Jane","Austen","F","Austen","Jane","Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine"
-"Jane","Austen","F","Austen","Jane","Pride & Prejudice","Mr Darcy","Proud landowner"
-"Herman","Melville","M","Melville","Herman","Moby Dick","Queeqeg","Tattooed harpooneer"
-"Herman","Melville","M","Melville","Herman","Moby Dick","Moby Dick","Great white whale"
+"Charles","Dickens","M","ChXrlXs DXckXns"
+"Jane","Austen","F","JXnX AXstXn"
+"Herman","Melville","M","HXrmXn MXlvXllX"
+"Flann","O'Brien","M","FlXnn O'BrXXn"
+"George","Elliot","F","GXXrgX EllXXt"
+"Virginia","Woolf","F","VXrgXnXX WXXlf"
+"Oscar","Wilde","M","OscXr WXldX"
+"Charles","Dickens","M","Dickens","Charles","Bleak House","Esther Sumerson","Drippy Heroine"
+"Charles","Dickens","M","Dickens","Charles","Bleak House","Inspector Bucket","Prototype detective"
+"Charles","Dickens","M","Dickens","Charles","Great Expectations","Pip","Deluded ex-blacksmith"
+"Charles","Dickens","M","Dickens","Charles","Bleak House","Mr Vholes","Vampiric lawyer"
+"Jane","Austen","F","Austen","Jane","Emma","Emma Woodhouse","Smug Surrey goddess"
+"Jane","Austen","F","Austen","Jane","Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine"
+"Jane","Austen","F","Austen","Jane","Pride & Prejudice","Mr Darcy","Proud landowner"
+"Herman","Melville","M","Melville","Herman","Moby Dick","Queeqeg","Tattooed harpooneer"
+"Herman","Melville","M","Melville","Herman","Moby Dick","Moby Dick","Great white whale"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/fileinfo.test csvfix-new/csvfix/tests/correct/fileinfo.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/fileinfo.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/fileinfo.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,14 +1,14 @@
-"data/names.csv (1)","Charles","Dickens","M"
-"data/names.csv (2)","Jane","Austen","F"
-"data/names.csv (3)","Herman","Melville","M"
-"data/names.csv (4)","Flann","O'Brien","M"
-"data/names.csv (5)","George","Elliot","F"
-"data/names.csv (6)","Virginia","Woolf","F"
-"data/names.csv (7)","Oscar","Wilde","M"
-"data/names.csv","1","Charles","Dickens","M"
-"data/names.csv","2","Jane","Austen","F"
-"data/names.csv","3","Herman","Melville","M"
-"data/names.csv","4","Flann","O'Brien","M"
-"data/names.csv","5","George","Elliot","F"
-"data/names.csv","6","Virginia","Woolf","F"
-"data/names.csv","7","Oscar","Wilde","M"
+"data/names.csv (1)","Charles","Dickens","M"
+"data/names.csv (2)","Jane","Austen","F"
+"data/names.csv (3)","Herman","Melville","M"
+"data/names.csv (4)","Flann","O'Brien","M"
+"data/names.csv (5)","George","Elliot","F"
+"data/names.csv (6)","Virginia","Woolf","F"
+"data/names.csv (7)","Oscar","Wilde","M"
+"data/names.csv","1","Charles","Dickens","M"
+"data/names.csv","2","Jane","Austen","F"
+"data/names.csv","3","Herman","Melville","M"
+"data/names.csv","4","Flann","O'Brien","M"
+"data/names.csv","5","George","Elliot","F"
+"data/names.csv","6","Virginia","Woolf","F"
+"data/names.csv","7","Oscar","Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/find.test csvfix-new/csvfix/tests/correct/find.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/find.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/find.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,40 +1,40 @@
-"GB","United Kingdom"
-"GB","United Kingdom"
-"FR","France"
-"FR","France"
-"DE","Germany"
-"NL","Netherlands"
-"IT","Italy"
-"US","United States"
-2
-"1","one"
-"empty",""
-"3","three"
-"empty",""
-"GB","United Kingdom"
-"FR","France"
-"DE","Germany"
-"1","17.0"
-"3","42"
-"Paris","FR"
-"Rome","IT"
-"Paris","FR"
-"one","two","three"
-"one","two","three"
-"one","two","three"
-"one","two","three"
-"one"
-"1","lower","lower case"
-"^$","empty"
-"one","two","three"
-"one","two","three"
-"one","two","three"
-"one","two"
-"one","two","three"
-"London","GB"
-"Paris","FR"
-"Edinurgh","GB"
-"Charles","Dickens","M"
-"Herman","Melville","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
+"GB","United Kingdom"
+"GB","United Kingdom"
+"FR","France"
+"FR","France"
+"DE","Germany"
+"NL","Netherlands"
+"IT","Italy"
+"US","United States"
+2
+"1","one"
+"empty",""
+"3","three"
+"empty",""
+"GB","United Kingdom"
+"FR","France"
+"DE","Germany"
+"1","17.0"
+"3","42"
+"Paris","FR"
+"Rome","IT"
+"Paris","FR"
+"one","two","three"
+"one","two","three"
+"one","two","three"
+"one","two","three"
+"one"
+"1","lower","lower case"
+"^$","empty"
+"one","two","three"
+"one","two","three"
+"one","two","three"
+"one","two"
+"one","two","three"
+"London","GB"
+"Paris","FR"
+"Edinurgh","GB"
+"Charles","Dickens","M"
+"Herman","Melville","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/fixed.test csvfix-new/csvfix/tests/correct/fixed.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/fixed.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/fixed.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,10 +1,10 @@
-"1234","78"
-"1234","78"
-"1234","78"
-Charles D
-Jane A
-Herman M
-Flann O
-George E
-Virginia W
-Oscar W
+"1234","78"
+"1234","78"
+"1234","78"
+Charles D
+Jane A
+Herman M
+Flann O
+George E
+Virginia W
+Oscar W
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/flatten.test csvfix-new/csvfix/tests/correct/flatten.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/flatten.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/flatten.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,13 +1,13 @@
-"A","a1","a2","a3","a4"
-"B","b1","b2"
-"A","a5","a6"
-"C","c1","c2","c3","c4"
-"1","a"
-"1","b"
-"1","c"
-"2","d"
-"2","e"
-"3","f"
-"3","g"
-"3","h"
-"3","i"
+"A","a1","a2","a3","a4"
+"B","b1","b2"
+"A","a5","a6"
+"C","c1","c2","c3","c4"
+"1","a"
+"1","b"
+"1","c"
+"2","d"
+"2","e"
+"3","f"
+"3","g"
+"3","h"
+"3","i"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/fmerge.test csvfix-new/csvfix/tests/correct/fmerge.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/fmerge.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/fmerge.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,20 +1,20 @@
-"1","one"
-"1","one"
-"2","two"
-"2","two"
-"3","three"
-"3","three"
-"4","four"
-"4","four"
-"5","five"
-"5","five"
-"1","one"
-"1","one"
-"2","two"
-"2","two"
-"3","three"
-"4","four"
-"4","four"
-"5","five"
-"5","five"
-"6","six"
+"1","one"
+"1","one"
+"2","two"
+"2","two"
+"3","three"
+"3","three"
+"4","four"
+"4","four"
+"5","five"
+"5","five"
+"1","one"
+"1","one"
+"2","two"
+"2","two"
+"3","three"
+"4","four"
+"4","four"
+"5","five"
+"5","five"
+"6","six"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/from_xml.test csvfix-new/csvfix/tests/correct/from_xml.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/from_xml.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/from_xml.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,18 +1,18 @@
-"Charles","Dickens","Bleak House","Esther Sumerson","Drippy heroine"
-"Charles","Dickens","Bleak House","Inspector Bucket","Prototype detective"
-"Charles","Dickens","Great Expectations","Pip","Deluded ex-blacksmith"
-"Charles","Dickens","Bleak House","Mr Vholes","Vampiric lawyer"
-"Jane","Austen","Emma","Emma Woodhouse","Smug Surrey goddess"
-"Jane","Austen","Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine"
-"Jane","Austen","Pride & Prejudice","Mr Darcy","Proud, wet-shirted landowner"
-"the root","foo","foo:bar","foo:bar:foo","nested foo stuff","other stuff"
-"the root","foo","not nested"
-"the root","foo","foo:bar","other stuff","foo:bar:foo","nested foo stuff"
-"root@foo@bar@foo","the root","foo","foo:bar","other stuff","foo:bar:foo","nested foo stuff"
-"root@foo@bar@other","the root","foo","foo:bar","foo:bar:foo","nested foo stuff","other stuff"
-"one","1"
-"beast","666"
-"empty",""
-"meaning","42"
-"root attrib","root string","root name","end root","2","foo","bar"
-"root attrib","root string","root name","end root","2","one","two"
+"Charles","Dickens","Bleak House","Esther Sumerson","Drippy heroine"
+"Charles","Dickens","Bleak House","Inspector Bucket","Prototype detective"
+"Charles","Dickens","Great Expectations","Pip","Deluded ex-blacksmith"
+"Charles","Dickens","Bleak House","Mr Vholes","Vampiric lawyer"
+"Jane","Austen","Emma","Emma Woodhouse","Smug Surrey goddess"
+"Jane","Austen","Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine"
+"Jane","Austen","Pride & Prejudice","Mr Darcy","Proud, wet-shirted landowner"
+"the root","foo","foo:bar","foo:bar:foo","nested foo stuff","other stuff"
+"the root","foo","not nested"
+"the root","foo","foo:bar","other stuff","foo:bar:foo","nested foo stuff"
+"root@foo@bar@foo","the root","foo","foo:bar","other stuff","foo:bar:foo","nested foo stuff"
+"root@foo@bar@other","the root","foo","foo:bar","foo:bar:foo","nested foo stuff","other stuff"
+"one","1"
+"beast","666"
+"empty",""
+"meaning","42"
+"root attrib","root string","root name","end root","2","foo","bar"
+"root attrib","root string","root name","end root","2","one","two"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/headtail.test csvfix-new/csvfix/tests/correct/headtail.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/headtail.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/headtail.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,32 +1,32 @@
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
------------------
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
------------------
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
------------------
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
------------------
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
------------------
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/inter.test csvfix-new/csvfix/tests/correct/inter.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/inter.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/inter.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,28 +1,28 @@
-"Charles","Dickens","M","Jim","1/12/1980"
-"Jane","Austen","F","Pete","23/4/1964"
-"Herman","Melville","M","Ann","3/3/1878"
-"Flann","O'Brien","M","Bad","Not A Date"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"Charles","1/12/1980","M"
-"Jane","23/4/1964","F"
-"Herman","3/3/1878","M"
-"Flann","Not A Date","M"
-"George","","F"
-"Virginia","","F"
-"Oscar","","M"
-"Charles","1/12/1980","M"
-"Jane","23/4/1964","F"
-"Herman","3/3/1878","M"
-"Flann","Not A Date","M"
-"George","","F"
-"Virginia","","F"
-"Oscar","","M"
-"Charles","1/12/1980","M","",""
-"Jane","23/4/1964","F","",""
-"Herman","3/3/1878","M","",""
-"Flann","Not A Date","M","",""
-"George","","F","",""
-"Virginia","","F","",""
-"Oscar","","M","",""
+"Charles","Dickens","M","Jim","1/12/1980"
+"Jane","Austen","F","Pete","23/4/1964"
+"Herman","Melville","M","Ann","3/3/1878"
+"Flann","O'Brien","M","Bad","Not A Date"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"Charles","1/12/1980","M"
+"Jane","23/4/1964","F"
+"Herman","3/3/1878","M"
+"Flann","Not A Date","M"
+"George","","F"
+"Virginia","","F"
+"Oscar","","M"
+"Charles","1/12/1980","M"
+"Jane","23/4/1964","F"
+"Herman","3/3/1878","M"
+"Flann","Not A Date","M"
+"George","","F"
+"Virginia","","F"
+"Oscar","","M"
+"Charles","1/12/1980","M","",""
+"Jane","23/4/1964","F","",""
+"Herman","3/3/1878","M","",""
+"Flann","Not A Date","M","",""
+"George","","F","",""
+"Virginia","","F","",""
+"Oscar","","M","",""
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/join.test csvfix-new/csvfix/tests/correct/join.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/join.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/join.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,38 +1,38 @@
---- equi join ---
-"London","GB","United Kingdom"
-"Paris","FR","France"
-"Edinurgh","GB","United Kingdom"
-"Amsterdam","NL","Netherlands"
-"Rome","IT","Italy"
-"Berlin","DE","Germany"
+"London","GB","United Kingdom"
+"Paris","FR","France"
+"Edinurgh","GB","United Kingdom"
+"Amsterdam","NL","Netherlands"
+"Rome","IT","Italy"
+"Berlin","DE","Germany"
---- equi join retaining key fields ---
-"London","GB","GB","United Kingdom"
-"Paris","FR","FR","France"
-"Edinurgh","GB","GB","United Kingdom"
-"Amsterdam","NL","NL","Netherlands"
-"Rome","IT","IT","Italy"
-"Berlin","DE","DE","Germany"
+"London","GB","GB","United Kingdom"
+"Paris","FR","FR","France"
+"Edinurgh","GB","GB","United Kingdom"
+"Amsterdam","NL","NL","Netherlands"
+"Rome","IT","IT","Italy"
+"Berlin","DE","DE","Germany"
---- exclude GB + NL ----
-"Paris","FR"
-"Rome","IT"
-"Athens","GR"
-"Berlin","DE"
+"Paris","FR"
+"Rome","IT"
+"Athens","GR"
+"Berlin","DE"
---- join with custom sep ----
-"1","foo","one"
-"2","bar","two"
-"3","zod","three"
+"1","foo","one"
+"2","bar","two"
+"3","zod","three"
---- join with custom sep (inverse) ----
-"2","bar"
-"3","zod"
+"2","bar"
+"3","zod"
---- join issue #12 stuff
-"2","true","3,4"
+"2","true","3,4"
---- join -ic option original data ----
-"Paris","FR"
-"Rome","IT"
-"Athens","GR"
-"Berlin","DE"
+"Paris","FR"
+"Rome","IT"
+"Athens","GR"
+"Berlin","DE"
---- join -ic option lowercase data ----
-"Paris","FR"
-"Rome","IT"
-"Athens","GR"
-"Berlin","DE"
+"Paris","FR"
+"Rome","IT"
+"Athens","GR"
+"Berlin","DE"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/map.test csvfix-new/csvfix/tests/correct/map.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/map.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/map.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,27 +1,27 @@
-"Charles","Dickens","Male"
-"Jane","Austen","Female"
-"Herman","Melville","Male"
-"Flann","O'Brien","Male"
-"George","Elliot","Female"
-"Virginia","Woolf","Female"
-"Oscar","Wilde","Male"
-"Charles","Dickens","X"
-"JANE","Austen","Y"
-"Herman","Melville","X"
-"Flann","O'Brien","X"
-"George","Elliot","Y"
-"Virginia","Woolf","Y"
-"Oscar","Wilde","X"
-"Charles","Dickens","X"
-"JANE","Austen","Y"
-"Herman","Melville","X"
-"Flann","O'Brien","X"
-"George","Elliot","Y"
-"Virginia","Woolf","Y"
-"Oscar","Wilde","X"
-"1","one"
-"empty","empty"
-"3","three"
-"1","one"
-"empty"," "
-"3","three"
+"Charles","Dickens","Male"
+"Jane","Austen","Female"
+"Herman","Melville","Male"
+"Flann","O'Brien","Male"
+"George","Elliot","Female"
+"Virginia","Woolf","Female"
+"Oscar","Wilde","Male"
+"Charles","Dickens","X"
+"JANE","Austen","Y"
+"Herman","Melville","X"
+"Flann","O'Brien","X"
+"George","Elliot","Y"
+"Virginia","Woolf","Y"
+"Oscar","Wilde","X"
+"Charles","Dickens","X"
+"JANE","Austen","Y"
+"Herman","Melville","X"
+"Flann","O'Brien","X"
+"George","Elliot","Y"
+"Virginia","Woolf","Y"
+"Oscar","Wilde","X"
+"1","one"
+"empty","empty"
+"3","three"
+"1","one"
+"empty"," "
+"3","three"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/mdflat.test csvfix-new/csvfix/tests/correct/mdflat.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/mdflat.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/mdflat.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,3 +1,3 @@
-"Joe","Blow","2012-01-13","Phone bill","105.10"
-"Jane","Doe","2012-01-10","Groceries","5.10"
-"Jane","Doe","2012-01-12","Drinks","7.15"
+"Joe","Blow","2012-01-13","Phone bill","105.10"
+"Jane","Doe","2012-01-10","Groceries","5.10"
+"Jane","Doe","2012-01-12","Drinks","7.15"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/merge.test csvfix-new/csvfix/tests/correct/merge.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/merge.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/merge.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,35 +1,35 @@
-"Charles Dickens","M"
-"Jane Austen","F"
-"Herman Melville","M"
-"Flann O'Brien","M"
-"George Elliot","F"
-"Virginia Woolf","F"
-"Oscar Wilde","M"
-"Charles","Dickens M"
-"Jane","Austen F"
-"Herman","Melville M"
-"Flann","O'Brien M"
-"George","Elliot F"
-"Virginia","Woolf F"
-"Oscar","Wilde M"
-"Dickens M","Charles"
-"Austen F","Jane"
-"Melville M","Herman"
-"O'Brien M","Flann"
-"Elliot F","George"
-"Woolf F","Virginia"
-"Wilde M","Oscar"
-"Charles:Dickens:M"
-"Jane:Austen:F"
-"Herman:Melville:M"
-"Flann:O'Brien:M"
-"George:Elliot:F"
-"Virginia:Woolf:F"
-"Oscar:Wilde:M"
-"Charles Dickens M"
-"Jane Austen F"
-"Herman Melville M"
-"Flann O'Brien M"
-"George Elliot F"
-"Virginia Woolf F"
-"Oscar Wilde M"
+"Charles Dickens","M"
+"Jane Austen","F"
+"Herman Melville","M"
+"Flann O'Brien","M"
+"George Elliot","F"
+"Virginia Woolf","F"
+"Oscar Wilde","M"
+"Charles","Dickens M"
+"Jane","Austen F"
+"Herman","Melville M"
+"Flann","O'Brien M"
+"George","Elliot F"
+"Virginia","Woolf F"
+"Oscar","Wilde M"
+"Dickens M","Charles"
+"Austen F","Jane"
+"Melville M","Herman"
+"O'Brien M","Flann"
+"Elliot F","George"
+"Woolf F","Virginia"
+"Wilde M","Oscar"
+"Charles:Dickens:M"
+"Jane:Austen:F"
+"Herman:Melville:M"
+"Flann:O'Brien:M"
+"George:Elliot:F"
+"Virginia:Woolf:F"
+"Oscar:Wilde:M"
+"Charles Dickens M"
+"Jane Austen F"
+"Herman Melville M"
+"Flann O'Brien M"
+"George Elliot F"
+"Virginia Woolf F"
+"Oscar Wilde M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/mline.test csvfix-new/csvfix/tests/correct/mline.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/mline.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/mline.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,4 +1,4 @@
-"batman","the caped crusader,
-scourge of the underworld"
-"thor","mighty,
-hammer swinging god"
+"batman","the caped crusader,
+scourge of the underworld"
+"thor","mighty,
+hammer swinging god"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/money.test csvfix-new/csvfix/tests/correct/money.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/money.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/money.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,8 +1,8 @@
-"1","17.0","1.00","17.00"
-"2","-100","2.00","-100.00"
-"3","123.45","3.00","123.45"
-"4","12345678.90","4.00","12,345,678.90"
-"1","17.0","$1,00","$17,00"
-"2","-100","$2,00","-$100,00"
-"3","123.45","$3,00","$123,45"
-"4","12345678.90","$4,00","$12.345.678,90"
+"1","17.0","1.00","17.00"
+"2","-100","2.00","-100.00"
+"3","123.45","3.00","123.45"
+"4","12345678.90","4.00","12,345,678.90"
+"1","17.0","$1,00","$17,00"
+"2","-100","$2,00","-$100,00"
+"3","123.45","$3,00","$123,45"
+"4","12345678.90","$4,00","$12.345.678,90"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/multi.test csvfix-new/csvfix/tests/correct/multi.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/multi.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/multi.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,2 +1,2 @@
-"Superman","Fortress Of solitude"
-"Batman","Batcave","Gotham City"
+"Superman","Fortress Of solitude"
+"Batman","Batcave","Gotham City"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/number.test csvfix-new/csvfix/tests/correct/number.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/number.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/number.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,8 +1,8 @@
-"1","17.0"
-"2","-100"
-"3","123.45"
-"4","12345678.90"
-"one","1234.56"
-"two","1234567.00"
-"one","1234.56"
-"two","1234567.00"
+"1","17.0"
+"2","-100"
+"3","123.45"
+"4","12345678.90"
+"one","1234.56"
+"two","1234567.00"
+"one","1234.56"
+"two","1234567.00"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/odbc.test csvfix-new/csvfix/tests/correct/odbc.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/odbc.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/odbc.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,6 +1,6 @@
-name,rank,serial_no
-"jones","sgt","12345"
-"smith","maj","34342"
-"black","maj","56431"
-"white","pvt","17139"
-"pink","pvt","67543"
+name,rank,serial_no
+"jones","sgt","12345"
+"smith","maj","34342"
+"black","maj","56431"
+"white","pvt","17139"
+"pink","pvt","67543"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/order.test csvfix-new/csvfix/tests/correct/order.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/order.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/order.test 2020-01-23 01:56:38.589938143 +1000
@@ -1,76 +1,76 @@
-"Charles","Dickens"
-"Jane","Austen"
-"Herman","Melville"
-"Flann","O'Brien"
-"George","Elliot"
-"Virginia","Woolf"
-"Oscar","Wilde"
-"Charles","Dickens"
-"Jane","Austen"
-"Herman","Melville"
-"Flann","O'Brien"
-"George","Elliot"
-"Virginia","Woolf"
-"Oscar","Wilde"
-"Charles"
-"Jane"
-"Herman"
-"Flann"
-"George"
-"Virginia"
-"Oscar"
-"Charles","Dickens","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"M","Dickens"
-"F","Austen"
-"M","Melville"
-"M","O'Brien"
-"F","Elliot"
-"F","Woolf"
-"M","Wilde"
-"M","Charles"
-"F","Jane"
-"M","Herman"
-"M","Flann"
-"F","George"
-"F","Virginia"
-"M","Oscar"
-"rank","name"
-"sgt","jones"
-"maj","smith"
-"maj","black"
-"pvt","white"
-"pvt","pink"
-"rank"
-"sgt"
-"maj"
-"maj"
-"pvt"
-"pvt"
-"Bleak House","Esther Sumerson","Drippy Heroine","Dickens"
-"Bleak House","Inspector Bucket","Prototype detective","Dickens"
-"Great Expectations","Pip","Deluded ex-blacksmith","Dickens"
-"Bleak House","Mr Vholes","Vampiric lawyer","Dickens"
-"Emma","Emma Woodhouse","Smug Surrey goddess","Austen"
-"Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine","Austen"
-"Pride & Prejudice","Mr Darcy","Proud landowner","Austen"
-"Moby Dick","Queeqeg","Tattooed harpooneer","Melville"
-"Moby Dick","Moby Dick","Great white whale","Melville"
-"Drippy Heroine","Esther Sumerson","Bleak House","Dickens"
-"Prototype detective","Inspector Bucket","Bleak House","Dickens"
-"Deluded ex-blacksmith","Pip","Great Expectations","Dickens"
-"Vampiric lawyer","Mr Vholes","Bleak House","Dickens"
-"Smug Surrey goddess","Emma Woodhouse","Emma","Austen"
-"Non-drippy heroine","Elizabeth Bennet","Pride & Prejudice","Austen"
-"Proud landowner","Mr Darcy","Pride & Prejudice","Austen"
-"Tattooed harpooneer","Queeqeg","Moby Dick","Melville"
-"Great white whale","Moby Dick","Moby Dick","Melville"
-"550","200","2000"
-"233","200","178","2001"
-"119","104","55","2002"
-"77","2003"
+"Charles","Dickens"
+"Jane","Austen"
+"Herman","Melville"
+"Flann","O'Brien"
+"George","Elliot"
+"Virginia","Woolf"
+"Oscar","Wilde"
+"Charles","Dickens"
+"Jane","Austen"
+"Herman","Melville"
+"Flann","O'Brien"
+"George","Elliot"
+"Virginia","Woolf"
+"Oscar","Wilde"
+"Charles"
+"Jane"
+"Herman"
+"Flann"
+"George"
+"Virginia"
+"Oscar"
+"Charles","Dickens","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"M","Dickens"
+"F","Austen"
+"M","Melville"
+"M","O'Brien"
+"F","Elliot"
+"F","Woolf"
+"M","Wilde"
+"M","Charles"
+"F","Jane"
+"M","Herman"
+"M","Flann"
+"F","George"
+"F","Virginia"
+"M","Oscar"
+"rank","name"
+"sgt","jones"
+"maj","smith"
+"maj","black"
+"pvt","white"
+"pvt","pink"
+"rank"
+"sgt"
+"maj"
+"maj"
+"pvt"
+"pvt"
+"Bleak House","Esther Sumerson","Drippy Heroine","Dickens"
+"Bleak House","Inspector Bucket","Prototype detective","Dickens"
+"Great Expectations","Pip","Deluded ex-blacksmith","Dickens"
+"Bleak House","Mr Vholes","Vampiric lawyer","Dickens"
+"Emma","Emma Woodhouse","Smug Surrey goddess","Austen"
+"Pride & Prejudice","Elizabeth Bennet","Non-drippy heroine","Austen"
+"Pride & Prejudice","Mr Darcy","Proud landowner","Austen"
+"Moby Dick","Queeqeg","Tattooed harpooneer","Melville"
+"Moby Dick","Moby Dick","Great white whale","Melville"
+"Drippy Heroine","Esther Sumerson","Bleak House","Dickens"
+"Prototype detective","Inspector Bucket","Bleak House","Dickens"
+"Deluded ex-blacksmith","Pip","Great Expectations","Dickens"
+"Vampiric lawyer","Mr Vholes","Bleak House","Dickens"
+"Smug Surrey goddess","Emma Woodhouse","Emma","Austen"
+"Non-drippy heroine","Elizabeth Bennet","Pride & Prejudice","Austen"
+"Proud landowner","Mr Darcy","Pride & Prejudice","Austen"
+"Tattooed harpooneer","Queeqeg","Moby Dick","Melville"
+"Great white whale","Moby Dick","Moby Dick","Melville"
+"550","200","2000"
+"233","200","178","2001"
+"119","104","55","2002"
+"77","2003"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/osep.test csvfix-new/csvfix/tests/correct/osep.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/osep.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/osep.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,12 +1,12 @@
-Charles|Dickens|M
-Jane|Austen|F
-Herman|Melville|M
-Flann|O'Brien|M
-George|Elliot|F
-Virginia|Woolf|F
-Oscar|Wilde|M
-1|this @ is an at-sign
-2|"this | is a pipe"
-3|"this "" is double quote"
-4|this ' is a single quote
-5|this , is a comma
+Charles|Dickens|M
+Jane|Austen|F
+Herman|Melville|M
+Flann|O'Brien|M
+George|Elliot|F
+Virginia|Woolf|F
+Oscar|Wilde|M
+1|this @ is an at-sign
+2|"this | is a pipe"
+3|"this "" is double quote"
+4|this ' is a single quote
+5|this , is a comma
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/out_join.test csvfix-new/csvfix/tests/correct/out_join.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/out_join.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/out_join.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,7 +1,7 @@
-"London","GB","United Kingdom"
-"Paris","FR","France"
-"Edinurgh","GB","United Kingdom"
-"Amsterdam","NL","Netherlands"
-"Rome","IT","Italy"
-"Athens","GR"
-"Berlin","DE","Germany"
+"London","GB","United Kingdom"
+"Paris","FR","France"
+"Edinurgh","GB","United Kingdom"
+"Amsterdam","NL","Netherlands"
+"Rome","IT","Italy"
+"Athens","GR"
+"Berlin","DE","Germany"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/pad.test csvfix-new/csvfix/tests/correct/pad.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/pad.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/pad.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,8 +1,8 @@
-"2000","200","550","NULL"
-"2001","178","200","233","140"
-"2002","55","104","119"
-"2003","77","NULL","NULL"
-"2000","200"
-"2001","178"
-"2002","55"
-"2003","77"
+"2000","200","550","NULL"
+"2001","178","200","233","140"
+"2002","55","104","119"
+"2003","77","NULL","NULL"
+"2000","200"
+"2001","178"
+"2002","55"
+"2003","77"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/pivot.test csvfix-new/csvfix/tests/correct/pivot.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/pivot.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/pivot.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,9 +1,9 @@
-"","beans","bread","rice"
-"north","37","7","13"
-"south","31","21","10"
-"","beans","bread","rice"
-"north","3","1","2"
-"south","2","2","2"
-"","beans","bread","rice"
-"north","12.3333","7","6.5"
-"south","15.5","10.5","5"
+"","beans","bread","rice"
+"north","37","7","13"
+"south","31","21","10"
+"","beans","bread","rice"
+"north","3","1","2"
+"south","2","2","2"
+"","beans","bread","rice"
+"north","12.3333","7","6.5"
+"south","15.5","10.5","5"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/printf.test csvfix-new/csvfix/tests/correct/printf.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/printf.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/printf.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,31 +1,31 @@
-Name: Charles Sex: M
-Name: Jane Sex: F
-Name: Herman Sex: M
-Name: Flann Sex: M
-Name: George Sex: F
-Name: Virginia Sex: F
-Name: Oscar Sex: M
-Sex: M Name: Charles Dickens
-Sex: F Name: Jane Austen
-Sex: M Name: Herman Melville
-Sex: M Name: Flann O'Brien
-Sex: F Name: George Elliot
-Sex: F Name: Virginia Woolf
-Sex: M Name: Oscar Wilde
-Name: Al ""Scarface"" Capone
-Name: Clyde Barrow
-Name: Michael ""Godfather 2"" Corleone
-Sex: M
-Name: Charles Dickens
-Sex: F
-Name: Jane Austen
-Sex: M
-Name: Herman Melville
-Sex: M
-Name: Flann O'Brien
-Sex: F
-Name: George Elliot
-Sex: F
-Name: Virginia Woolf
-Sex: M
-Name: Oscar Wilde
+Name: Charles Sex: M
+Name: Jane Sex: F
+Name: Herman Sex: M
+Name: Flann Sex: M
+Name: George Sex: F
+Name: Virginia Sex: F
+Name: Oscar Sex: M
+Sex: M Name: Charles Dickens
+Sex: F Name: Jane Austen
+Sex: M Name: Herman Melville
+Sex: M Name: Flann O'Brien
+Sex: F Name: George Elliot
+Sex: F Name: Virginia Woolf
+Sex: M Name: Oscar Wilde
+Name: Al ""Scarface"" Capone
+Name: Clyde Barrow
+Name: Michael ""Godfather 2"" Corleone
+Sex: M
+Name: Charles Dickens
+Sex: F
+Name: Jane Austen
+Sex: M
+Name: Herman Melville
+Sex: M
+Name: Flann O'Brien
+Sex: F
+Name: George Elliot
+Sex: F
+Name: Virginia Woolf
+Sex: M
+Name: Oscar Wilde
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/put.test csvfix-new/csvfix/tests/correct/put.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/put.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/put.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,13 +1,13 @@
-"Charles","foo","Dickens","M"
-"Jane","foo","Austen","F"
-"Herman","foo","Melville","M"
-"Flann","foo","O'Brien","M"
-"George","foo","Elliot","F"
-"Virginia","foo","Woolf","F"
-"Oscar","foo","Wilde","M"
-"3","one","two","three"
-"3","one","two","three"
-"1","one"
-"3","one","two","three"
-"2","one","two"
-"3","one","two","three"
+"Charles","foo","Dickens","M"
+"Jane","foo","Austen","F"
+"Herman","foo","Melville","M"
+"Flann","foo","O'Brien","M"
+"George","foo","Elliot","F"
+"Virginia","foo","Woolf","F"
+"Oscar","foo","Wilde","M"
+"3","one","two","three"
+"3","one","two","three"
+"1","one"
+"3","one","two","three"
+"2","one","two"
+"3","one","two","three"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/read_dsv.test csvfix-new/csvfix/tests/correct/read_dsv.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/read_dsv.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/read_dsv.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,19 +1,19 @@
-"foo","bar","666"
-"one","two","three"
-"pipe","this char | is a pipe",""
-"foo","bar","666"
-"one","two","three"
-"pipe","this char | is a pipe",""
-"","",""
-"","",""
-"","",""
-"fred","bloggs","42"
-"jane","doe","17"
-"fred","bloggs","42"
-"jane","doe","17"
-"fred","","","","bloggs","42"
-"jane","doe","","","","","17"
-"fred","bloggs","42"
-"jane","doe","17"
-"fred","bloggs","42"
-"jane","doe","17"
+"foo","bar","666"
+"one","two","three"
+"pipe","this char | is a pipe",""
+"foo","bar","666"
+"one","two","three"
+"pipe","this char | is a pipe",""
+"","",""
+"","",""
+"","",""
+"fred","bloggs","42"
+"jane","doe","17"
+"fred","bloggs","42"
+"jane","doe","17"
+"fred","","","","bloggs","42"
+"jane","doe","","","","","17"
+"fred","bloggs","42"
+"jane","doe","17"
+"fred","bloggs","42"
+"jane","doe","17"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/readme.txt csvfix-new/csvfix/tests/correct/readme.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/readme.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/readme.txt 2020-01-23 01:56:38.593271476 +1000
@@ -1,3 +1,3 @@
-These are the correct outputs for the CSVfix tests, against which
-each test run is diff'd. A test fails if it doesn't produce the
-correct output as defined here.
+These are the correct outputs for the CSVfix tests, against which
+each test run is diff'd. A test fails if it doesn't produce the
+correct output as defined here.
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/retsep.test csvfix-new/csvfix/tests/correct/retsep.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/retsep.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/retsep.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,14 +1,14 @@
-"Charles";"Dickens";"M"
-"Jane";"Austen";"F"
-"Herman";"Melville";"M"
-"Flann";"O'Brien";"M"
-"George";"Elliot";"F"
-"Virginia";"Woolf";"F"
-"Oscar";"Wilde";"M"
-Charles;Dickens,Mr;M
-Jane;Austen,Miss;F
-Herman;Melville,Mr;M
-Flann;O'Brien,Mr;M
-George;Elliot,???;F
-Virginia;Woolf,Mrs;F
-Oscar;Wilde,Mr;M
+"Charles";"Dickens";"M"
+"Jane";"Austen";"F"
+"Herman";"Melville";"M"
+"Flann";"O'Brien";"M"
+"George";"Elliot";"F"
+"Virginia";"Woolf";"F"
+"Oscar";"Wilde";"M"
+Charles;Dickens,Mr;M
+Jane;Austen,Miss;F
+Herman;Melville,Mr;M
+Flann;O'Brien,Mr;M
+George;Elliot,???;F
+Virginia;Woolf,Mrs;F
+Oscar;Wilde,Mr;M
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/rmnew.test csvfix-new/csvfix/tests/correct/rmnew.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/rmnew.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/rmnew.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,6 +1,6 @@
-"one","one line"
-"two","two:lines"
-"three","on:three:lines"
-"one","one line"
-"two","two"
-"three","on"
+"one","one line"
+"two","two:lines"
+"three","on:three:lines"
+"one","one line"
+"two","two"
+"three","on"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/rowsort.test csvfix-new/csvfix/tests/correct/rowsort.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/rowsort.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/rowsort.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,9 +1,9 @@
-"1","2","3"
-"1","2","3"
-"1","2","3"
-"1","2","3"
-"1","2","3"
-"1","2","3"
-"3","2","1"
-"3","2","1"
-"3","2","1"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"1","2","3"
+"3","2","1"
+"3","2","1"
+"3","2","1"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/sequence.test csvfix-new/csvfix/tests/correct/sequence.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/sequence.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/sequence.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,21 +1,21 @@
-"01000","Charles","Dickens","M"
-"01010","Jane","Austen","F"
-"01020","Herman","Melville","M"
-"01030","Flann","O'Brien","M"
-"01040","George","Elliot","F"
-"01050","Virginia","Woolf","F"
-"01060","Oscar","Wilde","M"
-"01000","Charles","Dickens","M"
-"00990","Jane","Austen","F"
-"00980","Herman","Melville","M"
-"00970","Flann","O'Brien","M"
-"00960","George","Elliot","F"
-"00950","Virginia","Woolf","F"
-"00940","Oscar","Wilde","M"
-"A01000Z","Charles","Dickens","M"
-"A01010Z","Jane","Austen","F"
-"A01020Z","Herman","Melville","M"
-"A01030Z","Flann","O'Brien","M"
-"A01040Z","George","Elliot","F"
-"A01050Z","Virginia","Woolf","F"
-"A01060Z","Oscar","Wilde","M"
+"01000","Charles","Dickens","M"
+"01010","Jane","Austen","F"
+"01020","Herman","Melville","M"
+"01030","Flann","O'Brien","M"
+"01040","George","Elliot","F"
+"01050","Virginia","Woolf","F"
+"01060","Oscar","Wilde","M"
+"01000","Charles","Dickens","M"
+"00990","Jane","Austen","F"
+"00980","Herman","Melville","M"
+"00970","Flann","O'Brien","M"
+"00960","George","Elliot","F"
+"00950","Virginia","Woolf","F"
+"00940","Oscar","Wilde","M"
+"A01000Z","Charles","Dickens","M"
+"A01010Z","Jane","Austen","F"
+"A01020Z","Herman","Melville","M"
+"A01030Z","Flann","O'Brien","M"
+"A01040Z","George","Elliot","F"
+"A01050Z","Virginia","Woolf","F"
+"A01060Z","Oscar","Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/shuffle.test csvfix-new/csvfix/tests/correct/shuffle.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/shuffle.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/shuffle.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,14 +1,14 @@
-"Flann","O'Brien","M"
-"Jane","Austen","F"
-"Virginia","Woolf","F"
-"Herman","Melville","M"
-"Oscar","Wilde","M"
-"Charles","Dickens","M"
-"George","Elliot","F"
-"Charles","Dickens","M"
-"Austen","F","Jane"
-"Herman","M","Melville"
-"M","Flann","O'Brien"
-"Elliot","George","F"
-"Virginia","Woolf","F"
-"M","Wilde","Oscar"
+"Flann","O'Brien","M"
+"Jane","Austen","F"
+"Virginia","Woolf","F"
+"Herman","Melville","M"
+"Oscar","Wilde","M"
+"Charles","Dickens","M"
+"George","Elliot","F"
+"Charles","Dickens","M"
+"Austen","F","Jane"
+"Herman","M","Melville"
+"M","Flann","O'Brien"
+"Elliot","George","F"
+"Virginia","Woolf","F"
+"M","Wilde","Oscar"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/skippass.test csvfix-new/csvfix/tests/correct/skippass.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/skippass.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/skippass.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,10 +1,10 @@
-"Jane","Austen"
-"George","Elliot"
-"Virginia","Woolf"
-"Charles","Dickens","M"
-"Jane","Austen"
-"Herman","Melville","M"
-"Flann","O'Brien","M"
-"George","Elliot"
-"Virginia","Woolf"
-"Oscar","Wilde","M"
+"Jane","Austen"
+"George","Elliot"
+"Virginia","Woolf"
+"Charles","Dickens","M"
+"Jane","Austen"
+"Herman","Melville","M"
+"Flann","O'Brien","M"
+"George","Elliot"
+"Virginia","Woolf"
+"Oscar","Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/smoke.test csvfix-new/csvfix/tests/correct/smoke.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/smoke.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/smoke.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,7 +1,7 @@
-"Charles","Dickens","Male"
-"Jane","Austen","Female"
-"Herman","Melville","Male"
-"Flann","O'Brien","Male"
-"George","Elliot","Female"
-"Virginia","Woolf","Female"
-"Oscar","Wilde","Male"
+"Charles","Dickens","Male"
+"Jane","Austen","Female"
+"Herman","Melville","Male"
+"Flann","O'Brien","Male"
+"George","Elliot","Female"
+"Virginia","Woolf","Female"
+"Oscar","Wilde","Male"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/sort.test csvfix-new/csvfix/tests/correct/sort.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/sort.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/sort.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,22 +1,22 @@
-"George","Elliot","F"
-"Jane","Austen","F"
-"Virginia","Woolf","F"
-"Charles","Dickens","M"
-"Flann","O'Brien","M"
-"Herman","Melville","M"
-"Oscar","Wilde","M"
-"Virginia","Woolf","F"
-"Oscar","Wilde","M"
-"Jane","Austen","F"
-"Herman","Melville","M"
-"George","Elliot","F"
-"Flann","O'Brien","M"
-"Charles","Dickens","M"
-Forename,Surname,Sex
-"Charles","Dickens","M"
-"Flann","O'Brien","M"
-"George","Elliot","F"
-"Herman","Melville","M"
-"Jane","Austen","F"
-"Oscar","Wilde","M"
-"Virginia","Woolf","F"
+"George","Elliot","F"
+"Jane","Austen","F"
+"Virginia","Woolf","F"
+"Charles","Dickens","M"
+"Flann","O'Brien","M"
+"Herman","Melville","M"
+"Oscar","Wilde","M"
+"Virginia","Woolf","F"
+"Oscar","Wilde","M"
+"Jane","Austen","F"
+"Herman","Melville","M"
+"George","Elliot","F"
+"Flann","O'Brien","M"
+"Charles","Dickens","M"
+Forename,Surname,Sex
+"Charles","Dickens","M"
+"Flann","O'Brien","M"
+"George","Elliot","F"
+"Herman","Melville","M"
+"Jane","Austen","F"
+"Oscar","Wilde","M"
+"Virginia","Woolf","F"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/specquote.test csvfix-new/csvfix/tests/correct/specquote.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/specquote.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/specquote.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,7 +1,7 @@
-Charles,"Dickens","M"
-Jane,"Austen","F"
-Herman,"Melville","M"
-Flann,"O'Brien","M"
-George,"Elliot","F"
-Virginia,"Woolf","F"
-Oscar,"Wilde","M"
+Charles,"Dickens","M"
+Jane,"Austen","F"
+Herman,"Melville","M"
+Flann,"O'Brien","M"
+George,"Elliot","F"
+Virginia,"Woolf","F"
+Oscar,"Wilde","M"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/splitlen.test csvfix-new/csvfix/tests/correct/splitlen.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/splitlen.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/splitlen.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,3 +1,3 @@
-"A","1234","xx"
-"A","123456","xx"
-"A","","xx"
+"A","1234","xx"
+"A","123456","xx"
+"A","","xx"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/splitregex.test csvfix-new/csvfix/tests/correct/splitregex.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/splitregex.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/splitregex.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,3 +1,3 @@
-"A","1234","xx"
-"A","123456","xx"
-"A","","xx"
+"A","1234","xx"
+"A","123456","xx"
+"A","","xx"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/split.test csvfix-new/csvfix/tests/correct/split.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/split.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/split.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,19 +1,19 @@
-"1090","M","Jeff Smith"
-"1099","F","Annette King"
-"1170","M","Bill Thompson"
-"1101","M","Jeremy Fisher"
-"1088","F","Lynn Morrice"
-"1090M","Jeff","Smith"
-"1099F","Annette","King"
-"1170M","Bill","Thompson"
-"1101M","Jeremy","Fisher"
-"1088F","Lynn","Morrice"
-"1090M","Jeff","Smith"
-"1099F","Annette","King"
-"1170M","Bill","Thompson"
-"1101M","Jeremy","Fisher"
-"1088F","Lynn","Morrice"
-"string","size"
-"string","length"
-"vector","push_back"
-"std","vector","push_back"
+"1090","M","Jeff Smith"
+"1099","F","Annette King"
+"1170","M","Bill Thompson"
+"1101","M","Jeremy Fisher"
+"1088","F","Lynn Morrice"
+"1090M","Jeff","Smith"
+"1099F","Annette","King"
+"1170M","Bill","Thompson"
+"1101M","Jeremy","Fisher"
+"1088F","Lynn","Morrice"
+"1090M","Jeff","Smith"
+"1099F","Annette","King"
+"1170M","Bill","Thompson"
+"1101M","Jeremy","Fisher"
+"1088F","Lynn","Morrice"
+"string","size"
+"string","length"
+"vector","push_back"
+"std","vector","push_back"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/splittrans.test csvfix-new/csvfix/tests/correct/splittrans.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/splittrans.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/splittrans.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,5 +1,5 @@
-"1234","fred","m"
-"22","bill","m"
-"171171","lynn","f"
-"fred","123"
-"satan","666"
+"1234","fred","m"
+"22","bill","m"
+"171171","lynn","f"
+"fred","123"
+"satan","666"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/sql_delete.test csvfix-new/csvfix/tests/correct/sql_delete.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/sql_delete.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/sql_delete.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,18 +1,18 @@
-DELETE FROM people WHERE forename = 'Charles' AND surname = 'Dickens'
-;
-DELETE FROM people WHERE forename = 'Jane' AND surname = 'Austen'
-;
-DELETE FROM people WHERE forename = 'Herman' AND surname = 'Melville'
-;
-DELETE FROM people WHERE forename = 'Flann' AND surname = 'O''Brien'
-;
-DELETE FROM people WHERE forename = 'George' AND surname = 'Elliot'
-;
-DELETE FROM people WHERE forename = 'Virginia' AND surname = 'Woolf'
-;
-DELETE FROM people WHERE forename = 'Oscar' AND surname = 'Wilde'
-;
-DELETE FROM dummy WHERE one = '1' AND two IS NULL
-;
-DELETE FROM dummy WHERE one IS NULL AND two IS NULL
-;
+DELETE FROM people WHERE forename = 'Charles' AND surname = 'Dickens'
+;
+DELETE FROM people WHERE forename = 'Jane' AND surname = 'Austen'
+;
+DELETE FROM people WHERE forename = 'Herman' AND surname = 'Melville'
+;
+DELETE FROM people WHERE forename = 'Flann' AND surname = 'O''Brien'
+;
+DELETE FROM people WHERE forename = 'George' AND surname = 'Elliot'
+;
+DELETE FROM people WHERE forename = 'Virginia' AND surname = 'Woolf'
+;
+DELETE FROM people WHERE forename = 'Oscar' AND surname = 'Wilde'
+;
+DELETE FROM dummy WHERE one = '1' AND two IS NULL
+;
+DELETE FROM dummy WHERE one IS NULL AND two IS NULL
+;
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/sql_insert.test csvfix-new/csvfix/tests/correct/sql_insert.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/sql_insert.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/sql_insert.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,34 +1,34 @@
-INSERT INTO people ( forename, surname ) VALUES( 'Charles', 'Dickens')
-;
-INSERT INTO people ( forename, surname ) VALUES( 'Jane', 'Austen')
-;
-INSERT INTO people ( forename, surname ) VALUES( 'Herman', 'Melville')
-;
-INSERT INTO people ( forename, surname ) VALUES( 'Flann', 'O''Brien')
-;
-INSERT INTO people ( forename, surname ) VALUES( 'George', 'Elliot')
-;
-INSERT INTO people ( forename, surname ) VALUES( 'Virginia', 'Woolf')
-;
-INSERT INTO people ( forename, surname ) VALUES( 'Oscar', 'Wilde')
-;
-INSERT INTO stuff ( name, value ) VALUES( 'this is one', '1')
-;
-INSERT INTO stuff ( name, value ) VALUES( 'this is null', null)
-;
-INSERT INTO stuff ( name, value ) VALUES( 'so is this', NULL)
-;
-INSERT INTO stuff ( name, value ) VALUES( 'this is two', '2')
-;
-INSERT INTO stuff ( name, value ) VALUES( 'this is one', '1')
-;
-INSERT INTO stuff ( name, value ) VALUES( 'this is null', 'null')
-;
-INSERT INTO stuff ( name, value ) VALUES( 'so is this', 'NULL')
-;
-INSERT INTO stuff ( name, value ) VALUES( 'this is two', '2')
-;
-INSERT INTO stuff ( name, value ) VALUES( '1', NULL)
-;
-INSERT INTO stuff ( name, value ) VALUES( NULL, NULL)
-;
+INSERT INTO people ( forename, surname ) VALUES( 'Charles', 'Dickens')
+;
+INSERT INTO people ( forename, surname ) VALUES( 'Jane', 'Austen')
+;
+INSERT INTO people ( forename, surname ) VALUES( 'Herman', 'Melville')
+;
+INSERT INTO people ( forename, surname ) VALUES( 'Flann', 'O''Brien')
+;
+INSERT INTO people ( forename, surname ) VALUES( 'George', 'Elliot')
+;
+INSERT INTO people ( forename, surname ) VALUES( 'Virginia', 'Woolf')
+;
+INSERT INTO people ( forename, surname ) VALUES( 'Oscar', 'Wilde')
+;
+INSERT INTO stuff ( name, value ) VALUES( 'this is one', '1')
+;
+INSERT INTO stuff ( name, value ) VALUES( 'this is null', null)
+;
+INSERT INTO stuff ( name, value ) VALUES( 'so is this', NULL)
+;
+INSERT INTO stuff ( name, value ) VALUES( 'this is two', '2')
+;
+INSERT INTO stuff ( name, value ) VALUES( 'this is one', '1')
+;
+INSERT INTO stuff ( name, value ) VALUES( 'this is null', 'null')
+;
+INSERT INTO stuff ( name, value ) VALUES( 'so is this', 'NULL')
+;
+INSERT INTO stuff ( name, value ) VALUES( 'this is two', '2')
+;
+INSERT INTO stuff ( name, value ) VALUES( '1', NULL)
+;
+INSERT INTO stuff ( name, value ) VALUES( NULL, NULL)
+;
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/sql_update.test csvfix-new/csvfix/tests/correct/sql_update.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/sql_update.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/sql_update.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,18 +1,18 @@
-UPDATE people SET forename = 'Charles', surname = 'Dickens' WHERE forename = 'Charles'
-;
-UPDATE people SET forename = 'Jane', surname = 'Austen' WHERE forename = 'Jane'
-;
-UPDATE people SET forename = 'Herman', surname = 'Melville' WHERE forename = 'Herman'
-;
-UPDATE people SET forename = 'Flann', surname = 'O''Brien' WHERE forename = 'Flann'
-;
-UPDATE people SET forename = 'George', surname = 'Elliot' WHERE forename = 'George'
-;
-UPDATE people SET forename = 'Virginia', surname = 'Woolf' WHERE forename = 'Virginia'
-;
-UPDATE people SET forename = 'Oscar', surname = 'Wilde' WHERE forename = 'Oscar'
-;
-UPDATE stuff SET one = '1', two = NULL WHERE one = '1'
-;
-UPDATE stuff SET one = NULL, two = NULL WHERE one IS NULL
-;
+UPDATE people SET forename = 'Charles', surname = 'Dickens' WHERE forename = 'Charles'
+;
+UPDATE people SET forename = 'Jane', surname = 'Austen' WHERE forename = 'Jane'
+;
+UPDATE people SET forename = 'Herman', surname = 'Melville' WHERE forename = 'Herman'
+;
+UPDATE people SET forename = 'Flann', surname = 'O''Brien' WHERE forename = 'Flann'
+;
+UPDATE people SET forename = 'George', surname = 'Elliot' WHERE forename = 'George'
+;
+UPDATE people SET forename = 'Virginia', surname = 'Woolf' WHERE forename = 'Virginia'
+;
+UPDATE people SET forename = 'Oscar', surname = 'Wilde' WHERE forename = 'Oscar'
+;
+UPDATE stuff SET one = '1', two = NULL WHERE one = '1'
+;
+UPDATE stuff SET one = NULL, two = NULL WHERE one IS NULL
+;
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/squash.test csvfix-new/csvfix/tests/correct/squash.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/squash.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/squash.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,18 +1,18 @@
-"bar","8"
-"foo","7"
-"zod","6"
-"foo","bar","4"
-"foo","xxx","5"
-"foo","zod","2"
-"goo","bar","11"
-"zoo","","6"
-"foo","bar","4.4"
-"foo","xxx","5.5"
-"foo","zod","2.2"
-"goo","bar","12.1"
-"zoo","","6.6"
-"foo","bar","4.4"
-"foo","xxx","42"
-"foo","zod","42"
-"goo","bar","12.1"
-"zoo","","6.6"
+"bar","8"
+"foo","7"
+"zod","6"
+"foo","bar","4"
+"foo","xxx","5"
+"foo","zod","2"
+"goo","bar","11"
+"zoo","","6"
+"foo","bar","4.4"
+"foo","xxx","5.5"
+"foo","zod","2.2"
+"goo","bar","12.1"
+"zoo","","6.6"
+"foo","bar","4.4"
+"foo","xxx","42"
+"foo","zod","42"
+"goo","bar","12.1"
+"zoo","","6.6"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/stat.test csvfix-new/csvfix/tests/correct/stat.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/stat.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/stat.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,14 +1,14 @@
-"data/names.csv","7","3","3","8","8","1"
-"data/army.csv","1","string","4","5"
-"data/army.csv","2","string","3","4"
-"data/army.csv","3","string","5","9"
-"data/books.csv","1","string","6","8"
-"data/books.csv","2","string","4","7"
-"data/books.csv","3","string","4","18"
-"data/books.csv","4","string","3","16"
-"data/books.csv","5","string","14","21"
-"data/numbers.csv","1","number","1","1"
-"data/numbers.csv","2","number","2","4"
-"data/army.csv","name","string","4","5"
-"data/army.csv","rank","string","3","3"
-"data/army.csv","serial_no","number","5","5"
+"data/names.csv","7","3","3","8","8","1"
+"data/army.csv","1","string","4","5"
+"data/army.csv","2","string","3","4"
+"data/army.csv","3","string","5","9"
+"data/books.csv","1","string","6","8"
+"data/books.csv","2","string","4","7"
+"data/books.csv","3","string","4","18"
+"data/books.csv","4","string","3","16"
+"data/books.csv","5","string","14","21"
+"data/numbers.csv","1","number","1","1"
+"data/numbers.csv","2","number","2","4"
+"data/army.csv","name","string","4","5"
+"data/army.csv","rank","string","3","3"
+"data/army.csv","serial_no","number","5","5"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/summary.test csvfix-new/csvfix/tests/correct/summary.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/summary.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/summary.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,5 +1,5 @@
-1: 4,5
-2: 3,4
-3: 5,9
-"2.5"
-"3"
+1: 4,5
+2: 3,4
+3: 5,9
+"2.5"
+"3"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/table.test csvfix-new/csvfix/tests/correct/table.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/table.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/table.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,23 +1,23 @@
-
-
- Charles | Dickens | M |
-
-
- Jane | Austen | F |
-
-
- Herman | Melville | M |
-
-
- Flann | O'Brien | M |
-
-
- George | Elliot | F |
-
-
- Virginia | Wolfe | F |
-
-
- Oscar | Wilde | M |
-
-
+
+
+ Charles | Dickens | M |
+
+
+ Jane | Austen | F |
+
+
+ Herman | Melville | M |
+
+
+ Flann | O'Brien | M |
+
+
+ George | Elliot | F |
+
+
+ Virginia | Wolfe | F |
+
+
+ Oscar | Wilde | M |
+
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/template.test csvfix-new/csvfix/tests/correct/template.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/template.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/template.test 2020-01-23 02:27:14.409919385 +1000
@@ -1,28 +1,28 @@
-Forename is Charles and surname is Dickens
-Forename is Jane and surname is Austen
-Forename is Herman and surname is Melville
-Forename is Flann and surname is O'Brien
-Forename is George and surname is Elliot
-Forename is Virginia and surname is Woolf
-Forename is Oscar and surname is Wilde
-Field #1: Charles
-Concat #1 and #2: Charles Dickens
-Upper #1: CHARLES
-Field #1: Jane
-Concat #1 and #2: Jane Austen
-Upper #1: JANE
-Field #1: Herman
-Concat #1 and #2: Herman Melville
-Upper #1: HERMAN
-Field #1: Flann
-Concat #1 and #2: Flann O'Brien
-Upper #1: FLANN
-Field #1: George
-Concat #1 and #2: George Elliot
-Upper #1: GEORGE
-Field #1: Virginia
-Concat #1 and #2: Virginia Woolf
-Upper #1: VIRGINIA
-Field #1: Oscar
-Concat #1 and #2: Oscar Wilde
-Upper #1: OSCAR
+Forename is Charles and surname is Dickens
+Forename is Jane and surname is Austen
+Forename is Herman and surname is Melville
+Forename is Flann and surname is O'Brien
+Forename is George and surname is Elliot
+Forename is Virginia and surname is Woolf
+Forename is Oscar and surname is Wilde
+Field #1: Charles
+Concat #1 and #2: Charles Dickens
+Upper #1: CHARLES
+Field #1: Jane
+Concat #1 and #2: Jane Austen
+Upper #1: JANE
+Field #1: Herman
+Concat #1 and #2: Herman Melville
+Upper #1: HERMAN
+Field #1: Flann
+Concat #1 and #2: Flann O'Brien
+Upper #1: FLANN
+Field #1: George
+Concat #1 and #2: George Elliot
+Upper #1: GEORGE
+Field #1: Virginia
+Concat #1 and #2: Virginia Woolf
+Upper #1: VIRGINIA
+Field #1: Oscar
+Concat #1 and #2: Oscar Wilde
+Upper #1: OSCAR
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/toxml.test csvfix-new/csvfix/tests/correct/toxml.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/toxml.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/toxml.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,87 +1,87 @@
-
-
-
- Stupid black furball
-
-
- Boring reptile
-
-
-
-
- A piece of wood
-
-
-
-
- Even more stupid than Alice
-
-
- Ball of claws
-
-
-
-
- Small rodent TV star
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dickens | Charles | Bleak House | Esther Sumerson | Drippy Heroine |
-
-
- Dickens | Charles | Bleak House | Inspector Bucket | Prototype detective |
-
-
- Dickens | Charles | Great Expectations | Pip | Deluded ex-blacksmith |
-
-
- Dickens | Charles | Bleak House | Mr Vholes | Vampiric lawyer |
-
-
- Austen | Jane | Emma | Emma Woodhouse | Smug Surrey goddess |
-
-
- Austen | Jane | Pride & Prejudice | Elizabeth Bennet | Non-drippy heroine |
-
-
- Austen | Jane | Pride & Prejudice | Mr Darcy | Proud landowner |
-
-
- Melville | Herman | Moby Dick | Queeqeg | Tattooed harpooneer |
-
-
- Melville | Herman | Moby Dick | Moby Dick | Great white whale |
-
-
+
+
+
+ Stupid black furball
+
+
+ Boring reptile
+
+
+
+
+ A piece of wood
+
+
+
+
+ Even more stupid than Alice
+
+
+ Ball of claws
+
+
+
+
+ Small rodent TV star
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Dickens | Charles | Bleak House | Esther Sumerson | Drippy Heroine |
+
+
+ Dickens | Charles | Bleak House | Inspector Bucket | Prototype detective |
+
+
+ Dickens | Charles | Great Expectations | Pip | Deluded ex-blacksmith |
+
+
+ Dickens | Charles | Bleak House | Mr Vholes | Vampiric lawyer |
+
+
+ Austen | Jane | Emma | Emma Woodhouse | Smug Surrey goddess |
+
+
+ Austen | Jane | Pride & Prejudice | Elizabeth Bennet | Non-drippy heroine |
+
+
+ Austen | Jane | Pride & Prejudice | Mr Darcy | Proud landowner |
+
+
+ Melville | Herman | Moby Dick | Queeqeg | Tattooed harpooneer |
+
+
+ Melville | Herman | Moby Dick | Moby Dick | Great white whale |
+
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/trim.test csvfix-new/csvfix/tests/correct/trim.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/trim.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/trim.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,14 +1,14 @@
-"1","leading"
-"2","trailing"
-"3","both"
-"C","D","M"
-"J","A","F"
-"H","M","M"
-"F","O","M"
-"G","E","F"
-"V","W","F"
-"O","W","M"
-"thequickbrownfox"
-"thequickbrownfox"
-"the quick brown fox"
-"the quick brown fox"
+"1","leading"
+"2","trailing"
+"3","both"
+"C","D","M"
+"J","A","F"
+"H","M","M"
+"F","O","M"
+"G","E","F"
+"V","W","F"
+"O","W","M"
+"thequickbrownfox"
+"thequickbrownfox"
+"the quick brown fox"
+"the quick brown fox"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/unique.test csvfix-new/csvfix/tests/correct/unique.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/unique.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/unique.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,9 +1,9 @@
-"London","NW"
-"Edinburgh","EH"
-"Lincoln","LN"
-"Manchester","M"
-"London","NW"
-"London","W"
-"London","E"
-"London","SE"
-"London","SW"
+"London","NW"
+"Edinburgh","EH"
+"Lincoln","LN"
+"Manchester","M"
+"London","NW"
+"London","W"
+"London","E"
+"London","SE"
+"London","SW"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/val_fields.test csvfix-new/csvfix/tests/correct/val_fields.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/val_fields.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/val_fields.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,9 +1,9 @@
-data/val_multi.csv (1): ,31/2/2012,xyz,payment,destination
- field: 4 - "payment" is invalid value
- field: 2 - Invalid date '31/2/2012'
- field: 3 - "xyz" is not numeric
-data/val_multi.csv (2): Lucas,31/2/2012,zsd,payment,
- field: 5 - field is empty
- field: 4 - "payment" is invalid value
- field: 2 - Invalid date '31/2/2012'
- field: 3 - "zsd" is not numeric
+data/val_multi.csv (1): ,31/2/2012,xyz,payment,destination
+ field: 4 - "payment" is invalid value
+ field: 2 - Invalid date '31/2/2012'
+ field: 3 - "xyz" is not numeric
+data/val_multi.csv (2): Lucas,31/2/2012,zsd,payment,
+ field: 5 - field is empty
+ field: 4 - "payment" is invalid value
+ field: 2 - Invalid date '31/2/2012'
+ field: 3 - "zsd" is not numeric
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/wmulti.test csvfix-new/csvfix/tests/correct/wmulti.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/wmulti.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/wmulti.test 2020-01-23 01:56:38.593271476 +1000
@@ -1,20 +1,20 @@
-bob,dylan
-bringing it all back home
-blonde on blonde
-john wesley harding
------
-nick,drake
-bryter later
-pink moon
------
-bob,dylan
-bringing it all back home
-blonde on blonde
-john wesley harding
-
-
-nick,drake
-bryter later
-pink moon
-
-
+bob,dylan
+bringing it all back home
+blonde on blonde
+john wesley harding
+-----
+nick,drake
+bryter later
+pink moon
+-----
+bob,dylan
+bringing it all back home
+blonde on blonde
+john wesley harding
+
+
+nick,drake
+bryter later
+pink moon
+
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/write_dsv.test csvfix-new/csvfix/tests/correct/write_dsv.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/write_dsv.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/write_dsv.test 2020-01-23 01:56:38.596604809 +1000
@@ -1,7 +1,7 @@
-Charles|Dickens|M
-Jane|Austen|F
-Herman|Melville|M
-Flann|O'Brien|M
-George|Elliot|F
-Virginia|Woolf|F
-Oscar|Wilde|M
+Charles|Dickens|M
+Jane|Austen|F
+Herman|Melville|M
+Flann|O'Brien|M
+George|Elliot|F
+Virginia|Woolf|F
+Oscar|Wilde|M
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/correct/xml_simple.test csvfix-new/csvfix/tests/correct/xml_simple.test
--- neilb-csvfix-93804d497be6/csvfix/tests/correct/xml_simple.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/correct/xml_simple.test 2020-01-23 01:56:38.596604809 +1000
@@ -1,4 +1,4 @@
-"Lucky","7"
-"Beast","666"
-"Meaning","42"
-"Gross","144"
+"Lucky","7"
+"Beast","666"
+"Meaning","42"
+"Gross","144"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/birthdays.csv csvfix-new/csvfix/tests/data/birthdays.csv
--- neilb-csvfix-93804d497be6/csvfix/tests/data/birthdays.csv 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/birthdays.csv 2020-01-23 02:38:18.789912543 +1000
@@ -1,4 +1,4 @@
-"Peter","20/8/2000"
-Jane,"12/2/1970"
-Bill,"14/Jun/1971"
-Anna,"27/12/1976"
+"Peter","20/8/2000"
+Jane,"12/2/1970"
+Bill,"14/Jun/1971"
+Anna,"27/12/1976"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/books.csv csvfix-new/csvfix/tests/data/books.csv
--- neilb-csvfix-93804d497be6/csvfix/tests/data/books.csv 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/books.csv 2020-01-23 02:44:30.536575327 +1000
@@ -1,9 +1,9 @@
-Dickens,Charles,Bleak House,Esther Sumerson,Drippy Heroine
-Dickens,Charles,Bleak House,Inspector Bucket,Prototype detective
-Dickens,Charles,Great Expectations,Pip,Deluded ex-blacksmith
-Dickens,Charles,Bleak House,Mr Vholes,Vampiric lawyer
-Austen,Jane,Emma,Emma Woodhouse,Smug Surrey goddess
-Austen,Jane,Pride & Prejudice,Elizabeth Bennet,Non-drippy heroine
-Austen,Jane,Pride & Prejudice,Mr Darcy,Proud landowner
-Melville,Herman,Moby Dick,Queeqeg,Tattooed harpooneer
-Melville,Herman,Moby Dick,Moby Dick,Great white whale
+Dickens,Charles,Bleak House,Esther Sumerson,Drippy Heroine
+Dickens,Charles,Bleak House,Inspector Bucket,Prototype detective
+Dickens,Charles,Great Expectations,Pip,Deluded ex-blacksmith
+Dickens,Charles,Bleak House,Mr Vholes,Vampiric lawyer
+Austen,Jane,Emma,Emma Woodhouse,Smug Surrey goddess
+Austen,Jane,Pride & Prejudice,Elizabeth Bennet,Non-drippy heroine
+Austen,Jane,Pride & Prejudice,Mr Darcy,Proud landowner
+Melville,Herman,Moby Dick,Queeqeg,Tattooed harpooneer
+Melville,Herman,Moby Dick,Moby Dick,Great white whale
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/multiline.txt csvfix-new/csvfix/tests/data/multiline.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/data/multiline.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/multiline.txt 2020-01-23 02:23:58.583254802 +1000
@@ -1,7 +1,7 @@
-Superman
-Fortress Of solitude
-%
-Batman
-Batcave
-Gotham City
-%
+Superman
+Fortress Of solitude
+%
+Batman
+Batcave
+Gotham City
+%
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/names.csv csvfix-new/csvfix/tests/data/names.csv
--- neilb-csvfix-93804d497be6/csvfix/tests/data/names.csv 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/names.csv 2020-01-23 02:56:15.773234805 +1000
@@ -1,7 +1,7 @@
-Charles,Dickens,M
-Jane,Austen,F
-Herman,Melville,M
-Flann,O'Brien,M
-George,Elliot,F
-Virginia,Woolf,F
-Oscar,Wilde,M
+Charles,Dickens,M
+Jane,Austen,F
+Herman,Melville,M
+Flann,O'Brien,M
+George,Elliot,F
+Virginia,Woolf,F
+Oscar,Wilde,M
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/sample.dsv csvfix-new/csvfix/tests/data/sample.dsv
--- neilb-csvfix-93804d497be6/csvfix/tests/data/sample.dsv 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/sample.dsv 2020-01-23 02:34:20.073248360 +1000
@@ -1,3 +1,3 @@
-foo|bar|666
-one|two|three
-pipe|this char \| is a pipe|
+foo|bar|666
+one|two|three
+pipe|this char \| is a pipe|
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/spacesep.txt csvfix-new/csvfix/tests/data/spacesep.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/data/spacesep.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/spacesep.txt 2020-01-23 02:34:43.526581461 +1000
@@ -1,4 +1,4 @@
-fred bloggs 42
-jane doe 17
-fred bloggs 42
-jane doe 17
+fred bloggs 42
+jane doe 17
+fred bloggs 42
+jane doe 17
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/tabsep.txt csvfix-new/csvfix/tests/data/tabsep.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/data/tabsep.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/tabsep.txt 2020-01-23 02:34:43.526581461 +1000
@@ -1,2 +1,2 @@
-fred bloggs 42
-jane doe 17
+fred bloggs 42
+jane doe 17
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/template.txt csvfix-new/csvfix/tests/data/template.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/data/template.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/template.txt 2020-01-23 02:27:30.696585859 +1000
@@ -1 +1 @@
-Forename is {1} and surname is {2}
+Forename is {1} and surname is {2}
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/data/tplexpr.txt csvfix-new/csvfix/tests/data/tplexpr.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/data/tplexpr.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/data/tplexpr.txt 2020-01-23 02:31:52.459916519 +1000
@@ -1,3 +1,3 @@
-Field #1: {1}
-Concat #1 and #2: {@$1 . " " . $2}
-Upper #1: {@upper($1)}
+Field #1: {1}
+Concat #1 and #2: {@$1 . " " . $2}
+Upper #1: {@upper($1)}
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/run1 csvfix-new/csvfix/tests/run1
--- neilb-csvfix-93804d497be6/csvfix/tests/run1 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/run1 2020-01-23 01:57:39.569937509 +1000
@@ -1,137 +1,138 @@
-#!bash
-# run1
-# run single test
-# copyright (C) 2008 Neil Butterworth
-
-#set -x
-
-# currently only one switch allowed on command line - needs fixing
-
-
-DO_OUT=0
-if [ "$1" = "-o" ]
-then
- DO_OUT=1
- shift
-fi
-
-DO_CORRECT=0
-if [ "$1" = "-c" ]
-then
- DO_CORRECT=1
- shift
-fi
-
-DO_DIFF=0
-if [ "$1" = "-d" ]
-then
- DO_DIFF=1
- shift
-fi
-
-USE_WINDIFF=0
-if [ "$1" = "-wd" ]
-then
- USE_WINDIFF=1
- shift
-fi
-
-if [ "$1" = "" ]
-then
- TEST=$(swine open -dir tests -caption "Select Test" -types test)
- if [ $TEST = "" ]
- then
- echo "missing test name"
- exit 1
- fi
-else
- TEST="$1"
-fi
-
-# exe to be tested - used in tests
-CSVED=../bin/csvfix.exe
-export CSVED
-
-if [ ! -f "$CSVED" ]
-then
- echo "No such binary: $CSVED"
- exit 1
-fi
-
-if [ ! -d tmp ]
-then
- mkdir tmp
-fi
-
-# where to find diff & where to put output
-DIFF=/bin/diff
-DIFFOUT=tmp/_diffout
-WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"
-TEST=`basename $TEST`
-OUT="tmp/$TEST"
-
-# pretty display - needs ANSI term support
-color_red()
-{
- echo -e "\033[01;31m$1\033[00m"
-}
-
-if [ ! -f tests/$TEST ]
-then
- echo "No test: $TEST"
- exit 1
-fi
-
-# run test, displaying output but not diffing
-if [ "$DO_OUT" = "1" ]
-then
- bash "tests/$TEST"
- exit 0
-fi
-
-# store correct output without displaying it
-if [ "$DO_CORRECT" = "1" ]
-then
- if bash "tests/$TEST" > correct/$TEST
- then
- echo "Created correct output"
- exit 0
- else
- echo "Execution problem with $TEST -c - please correct"
- exit 1
- fi
-fi
-
-# run proper test - must have correct output to test against
-if [ ! -f correct/$TEST ]
-then
- echo "No correct output $TEST"
- exit 1
-fi
-
-# run test producing output then diff that output against the previously
-# saved correct output
-if bash "tests/$TEST" > $OUT
-then
- if $DIFF correct/$TEST tmp/$TEST > $DIFFOUT
- then
- echo PASSED $TEST
- exit 0
- else
- color_red "FAILED $TEST"
- if [ "$USE_WINDIFF" = "1" ]
- then
- "$WINDIFF" correct/$TEST tmp/$TEST
- exit 1
- else
- if [ "$DO_DIFF" = "1" ]
- then
- cat $DIFFOUT
- fi
- exit 1
- fi
- fi
-else
- echo "Execution problem with $TEST - please correct"
-fi
-
+#!/bin/bash
+# run1
+# run single test
+# copyright (C) 2008 Neil Butterworth
+
+#set -x
+
+# currently only one switch allowed on command line - needs fixing
+
+
+DO_OUT=0
+if [ "$1" = "-o" ]
+then
+ DO_OUT=1
+ shift
+fi
+
+DO_CORRECT=0
+if [ "$1" = "-c" ]
+then
+ DO_CORRECT=1
+ shift
+fi
+
+DO_DIFF=0
+if [ "$1" = "-d" ]
+then
+ DO_DIFF=1
+ shift
+fi
+
+USE_WINDIFF=0
+if [ "$1" = "-wd" ]
+then
+ USE_WINDIFF=1
+ shift
+fi
+
+if [ "$1" = "" ]
+then
+ TEST=$(swine open -dir tests -caption "Select Test" -types test)
+ if [ $TEST = "" ]
+ then
+ echo "missing test name"
+ exit 1
+ fi
+else
+ TEST="$1"
+fi
+
+# exe to be tested - used in tests
+#CSVED=../bin/csvfix.exe
+CSVED=../bin/csvfix
+export CSVED
+
+if [ ! -f "$CSVED" ]
+then
+ echo "No such binary: $CSVED"
+ exit 1
+fi
+
+if [ ! -d tmp ]
+then
+ mkdir tmp
+fi
+
+# where to find diff & where to put output
+DIFF=/usr/bin/diff
+DIFFOUT=tmp/_diffout
+WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"
+TEST=`basename $TEST`
+OUT="tmp/$TEST"
+
+# pretty display - needs ANSI term support
+color_red()
+{
+ echo -e "\033[01;31m$1\033[00m"
+}
+
+if [ ! -f tests/$TEST ]
+then
+ echo "No test: $TEST"
+ exit 1
+fi
+
+# run test, displaying output but not diffing
+if [ "$DO_OUT" = "1" ]
+then
+ bash "tests/$TEST"
+ exit 0
+fi
+
+# store correct output without displaying it
+if [ "$DO_CORRECT" = "1" ]
+then
+ if bash "tests/$TEST" > correct/$TEST
+ then
+ echo "Created correct output"
+ exit 0
+ else
+ echo "Execution problem with $TEST -c - please correct"
+ exit 1
+ fi
+fi
+
+# run proper test - must have correct output to test against
+if [ ! -f correct/$TEST ]
+then
+ echo "No correct output $TEST"
+ exit 1
+fi
+
+# run test producing output then diff that output against the previously
+# saved correct output
+if bash "tests/$TEST" > $OUT
+then
+ if $DIFF correct/$TEST tmp/$TEST > $DIFFOUT
+ then
+ echo PASSED $TEST
+ exit 0
+ else
+ color_red "FAILED $TEST"
+ if [ "$USE_WINDIFF" = "1" ]
+ then
+ "$WINDIFF" correct/$TEST tmp/$TEST
+ exit 1
+ else
+ if [ "$DO_DIFF" = "1" ]
+ then
+ cat $DIFFOUT
+ fi
+ exit 1
+ fi
+ fi
+else
+ echo "Execution problem with $TEST - please correct"
+fi
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/runtests csvfix-new/csvfix/tests/runtests
--- neilb-csvfix-93804d497be6/csvfix/tests/runtests 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/runtests 2020-01-23 01:58:57.699936713 +1000
@@ -1,24 +1,24 @@
-#!bash
-# runall.bash
-# run all tests and report
-
-# set -x
-
-TOTAL=0
-PASSES=0
-FAILS=0
-for TEST in tests/*.test
-do
- TESTNAME=`basename $TEST`
- if ./run1 $TESTNAME
- then
- let PASSES=PASSES+1
- else
- let FAILS=FAILS+1
- fi
-done
-
-echo ""
-echo $FAILS failed, $PASSES passed
-echo ""
-
+#!/bin/bash
+# runall.bash
+# run all tests and report
+
+# set -x
+
+TOTAL=0
+PASSES=0
+FAILS=0
+for TEST in tests/*.test
+do
+ TESTNAME=`basename $TEST`
+ if ./run1 $TESTNAME
+ then
+ let PASSES=PASSES+1
+ else
+ let FAILS=FAILS+1
+ fi
+done
+
+echo ""
+echo $FAILS failed, $PASSES passed
+echo ""
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/ab.test csvfix-new/csvfix/tests/tests/ab.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/ab.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/ab.test 2020-01-23 01:53:23.533273489 +1000
@@ -1 +1 @@
-$CSVED ec data/names.csv
+$CSVED ec data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/atable.test csvfix-new/csvfix/tests/tests/atable.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/atable.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/atable.test 2020-01-23 01:53:23.533273489 +1000
@@ -1,2 +1,2 @@
-$CSVED ascii_table -h '@' data/army.csv
-$CSVED ascii_table -s -h '@' data/army.csv
+$CSVED ascii_table -h '@' data/army.csv
+$CSVED ascii_table -s -h '@' data/army.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/block.test csvfix-new/csvfix/tests/tests/block.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/block.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/block.test 2020-01-23 01:53:23.536606822 +1000
@@ -1 +1 @@
-$CSVED block -be '$1 == 2' -ee '$1 == 4' -m 'BLOCK,NOT' data/block1.csv
+$CSVED block -be '$1 == 2' -ee '$1 == 4' -m 'BLOCK,NOT' data/block1.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/case.test csvfix-new/csvfix/tests/tests/case.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/case.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/case.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,3 +1,3 @@
-$CSVED upper -f 2 data/names.csv
-$CSVED lower -f 2 data/names.csv
-$CSVED mixed -f 2 data/names.csv
+$CSVED upper -f 2 data/names.csv
+$CSVED lower -f 2 data/names.csv
+$CSVED mixed -f 2 data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/check.test csvfix-new/csvfix/tests/tests/check.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/check.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/check.test 2020-01-23 02:03:01.186600915 +1000
@@ -1,2 +1,2 @@
-$CSVED check -v data/names.csv
-$CSVED check -v data/birthdays.csv
+$CSVED check -v data/names.csv
+$CSVED check -v data/birthdays.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/dates.test csvfix-new/csvfix/tests/tests/dates.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/dates.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/dates.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,5 +1,5 @@
-$CSVED date_iso -m d/m/y -f 2 data/dates.csv
-$CSVED date_iso -m d/m/y -f 2 -bdx data/dates.csv
-$CSVED date_iso -m d/m/y -f 2 -bdl data/dates.csv
-$CSVED date_iso -m d/m/y -f 2 data/birthdays.csv | $CSVED date_format -f 2 -fmt 'dd-mmm-yyyy'
-
+$CSVED date_iso -m d/m/y -f 2 data/dates.csv
+$CSVED date_iso -m d/m/y -f 2 -bdx data/dates.csv
+$CSVED date_iso -m d/m/y -f 2 -bdl data/dates.csv
+$CSVED date_iso -m d/m/y -f 2 data/birthdays.csv | $CSVED date_format -f 2 -fmt 'dd-mmm-yyyy'
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/diff.test csvfix-new/csvfix/tests/tests/diff.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/diff.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/diff.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,8 +1,8 @@
-$CSVED diff data/n1.csv data/n1.csv
-$CSVED diff data/n1.csv data/n2.csv
-$CSVED diff data/n1.csv data/n3.csv
-$CSVED diff data/n3.csv data/n1.csv
-$CSVED diff data/nf.csv data/nf2.csv
-$CSVED diff -f 1,3 data/nf.csv data/nf2.csv
-$CSVED diff -f 2 data/nf.csv data/nf2.csv
-exit 0
+$CSVED diff data/n1.csv data/n1.csv
+$CSVED diff data/n1.csv data/n2.csv
+$CSVED diff data/n1.csv data/n3.csv
+$CSVED diff data/n3.csv data/n1.csv
+$CSVED diff data/nf.csv data/nf2.csv
+$CSVED diff -f 1,3 data/nf.csv data/nf2.csv
+$CSVED diff -f 2 data/nf.csv data/nf2.csv
+exit 0
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/echo.test csvfix-new/csvfix/tests/tests/echo.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/echo.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/echo.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,4 +1,4 @@
-$CSVED echo data/names.csv
-$CSVED echo data/names.csv - data/cities.csv < data/countries.csv
-$CSVED echo -sep ';' data/names_scs.csv
-$CSVED echo -sep ';' -osep '=' data/names_scs.csv
+$CSVED echo data/names.csv
+$CSVED echo data/names.csv - data/cities.csv < data/countries.csv
+$CSVED echo -sep ';' data/names_scs.csv
+$CSVED echo -sep ';' -osep '=' data/names_scs.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/edit.test csvfix-new/csvfix/tests/tests/edit.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/edit.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/edit.test 2020-01-23 02:18:49.649924693 +1000
@@ -1,6 +1,6 @@
-$CSVED edit -f 2 -e "s/e/XX/g" data/names.csv
-$CSVED edit -f 2 -e "s:e:XX:g" data/names.csv
-$CSVED edit -f 2 -e "s/e/\/XX/g" data/names.csv
-$CSVED edit -f 2 -e "s/xxx/ZZZZ/g" data/names.csv
-$CSVED edit -f 3 -e "s/\([MF]\)/:\1:/" data/names.csv
-$CSVED edit -f 3 -e "s/^$/ /" data/mc.csv
+$CSVED edit -f 2 -e "s/e/XX/g" data/names.csv
+$CSVED edit -f 2 -e "s:e:XX:g" data/names.csv
+$CSVED edit -f 2 -e "s/e/\/XX/g" data/names.csv
+$CSVED edit -f 2 -e "s/xxx/ZZZZ/g" data/names.csv
+$CSVED edit -f 3 -e "s/([MF])/:\1:/" data/names.csv
+$CSVED edit -f 3 -e "s/^$/ /" data/mc.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/escape.test csvfix-new/csvfix/tests/tests/escape.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/escape.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/escape.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,4 +1,4 @@
-# test escape command
-$CSVED escape -sql data/names.csv
-$CSVED escape -s lynn data/names.csv
-$CSVED escape -s lynn -f 2 data/names.csv
+# test escape command
+$CSVED escape -sql data/names.csv
+$CSVED escape -s lynn data/names.csv
+$CSVED escape -s lynn -f 2 data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/evalextra.test csvfix-new/csvfix/tests/tests/evalextra.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/evalextra.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/evalextra.test 2020-01-23 01:53:23.536606822 +1000
@@ -1 +1 @@
-$CSVED eval -e '-1' -e '-1+1' -e 'substr("123",1,2)+1' -e 'substr("123",1,2)-1' data/one.csv
+$CSVED eval -e '-1' -e '-1+1' -e 'substr("123",1,2)+1' -e 'substr("123",1,2)-1' data/one.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/eval.test csvfix-new/csvfix/tests/tests/eval.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/eval.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/eval.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,6 +1,6 @@
-$CSVED eval -e '($1 + $2)/2' data/numbers.csv
-$CSVED eval -e 'if(match($2,"^G"),$1,"Ignore")' data/cities.csv
-$CSVED eval -r 1,'if(match($2,"^G"),$1,"Ignore")' data/cities.csv
-$CSVED eval -e '($1 - $2)/2' data/numbers.csv
-$CSVED eval -d -e '($1 - $2)/2' data/numbers.csv
-$CSVED eval -d -if '$1<3' -e '"too small"' -e '($1 - $2)/2' data/numbers.csv
+$CSVED eval -e '($1 + $2)/2' data/numbers.csv
+$CSVED eval -e 'if(match($2,"^G"),$1,"Ignore")' data/cities.csv
+$CSVED eval -r 1,'if(match($2,"^G"),$1,"Ignore")' data/cities.csv
+$CSVED eval -e '($1 - $2)/2' data/numbers.csv
+$CSVED eval -d -e '($1 - $2)/2' data/numbers.csv
+$CSVED eval -d -if '$1<3' -e '"too small"' -e '($1 - $2)/2' data/numbers.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/exclude.test csvfix-new/csvfix/tests/tests/exclude.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/exclude.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/exclude.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,3 +1,3 @@
-$CSVED exclude -f 1,3 data/names.csv
-$CSVED exclude -rf 1 data/names.csv
-$CSVED exclude -f 1 -if 'len($1) > 5' data/names.csv
+$CSVED exclude -f 1,3 data/names.csv
+$CSVED exclude -rf 1 data/names.csv
+$CSVED exclude -f 1 -if 'len($1) > 5' data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/exec.test csvfix-new/csvfix/tests/tests/exec.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/exec.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/exec.test 2020-01-23 10:54:08.463461035 +1000
@@ -1,3 +1,3 @@
-$CSVED exec -c 'echo %1 %2|tr aeiou X' data/names.csv
-$CSVED exec -ix 1 -c 'grep %1 data/books.csv' data/names.csv
-
+$CSVED exec -c 'echo %1 %2|tr aeiou X' data/names.csv
+$CSVED exec -ix 1 -c 'grep %1 data/books.csv' data/names.csv
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/fileinfo.test csvfix-new/csvfix/tests/tests/fileinfo.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/fileinfo.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/fileinfo.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,2 +1,2 @@
-$CSVED file_info data/names.csv
-$CSVED file_info -tc data/names.csv
+$CSVED file_info data/names.csv
+$CSVED file_info -tc data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/find.test csvfix-new/csvfix/tests/tests/find.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/find.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/find.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,18 +1,18 @@
-# test find ad remove
-$CSVED find -e GB -f 1 data/countries.csv
-$CSVED find -s GB -s FR -f 1 data/countries.csv
-$CSVED remove -e GB -f 1 data/countries.csv
-$CSVED find -f 2 -e 'GB' -n data/cities.csv
-$CSVED find -f 2 -e '.*' data/f2empty.csv
-$CSVED find -f 2 -e '^$' data/f2empty.csv
-$CSVED find -r A:H -f 1 data/countries.csv
-$CSVED find -r 10:50 -f 2 data/numbers.csv
-$CSVED find -l 1:5 -f 1 data/cities.csv
-$CSVED find -l 5 -f 1 data/cities.csv
-$CSVED find -fc 3 data/varfields.csv
-$CSVED find -fc 1 data/varfields.csv
-$CSVED find -f 2 -ei 'LoWer' data/ulcase.csv
-$CSVED find -f 1 -si '^$' data/rechars.csv
-$CSVED remove -fc 1 data/varfields.csv
-$CSVED find -if '$2 == "GB" || $2 == "FR"' data/cities.csv
-$CSVED find -if 'len($1) > 5' data/names.csv
+# test find ad remove
+$CSVED find -e GB -f 1 data/countries.csv
+$CSVED find -s GB -s FR -f 1 data/countries.csv
+$CSVED remove -e GB -f 1 data/countries.csv
+$CSVED find -f 2 -e 'GB' -n data/cities.csv
+$CSVED find -f 2 -e '.*' data/f2empty.csv
+$CSVED find -f 2 -e '^$' data/f2empty.csv
+$CSVED find -r A:H -f 1 data/countries.csv
+$CSVED find -r 10:50 -f 2 data/numbers.csv
+$CSVED find -l 1:5 -f 1 data/cities.csv
+$CSVED find -l 5 -f 1 data/cities.csv
+$CSVED find -fc 3 data/varfields.csv
+$CSVED find -fc 1 data/varfields.csv
+$CSVED find -f 2 -ei 'LoWer' data/ulcase.csv
+$CSVED find -f 1 -si '^$' data/rechars.csv
+$CSVED remove -fc 1 data/varfields.csv
+$CSVED find -if '$2 == "GB" || $2 == "FR"' data/cities.csv
+$CSVED find -if 'len($1) > 5' data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/fixed.test csvfix-new/csvfix/tests/tests/fixed.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/fixed.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/fixed.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,3 +1,3 @@
-# test fixed format input
-$CSVED read_fixed -f 1:4,7:2 data/fixed.dat
-$CSVED write_fixed -f 1:32,2:1 data/names.csv
+# test fixed format input
+$CSVED read_fixed -f 1:4,7:2 data/fixed.dat
+$CSVED write_fixed -f 1:32,2:1 data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/flatten.test csvfix-new/csvfix/tests/tests/flatten.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/flatten.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/flatten.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,3 +1,3 @@
-# test flatten
-$CSVED flatten data/flat.csv
-$CSVED unflatten data/unflat.csv
+# test flatten
+$CSVED flatten data/flat.csv
+$CSVED unflatten data/unflat.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/fmerge.test csvfix-new/csvfix/tests/tests/fmerge.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/fmerge.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/fmerge.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,2 +1,2 @@
-$CSVED file_merge data/n1.csv data/n1.csv
-$CSVED file_merge data/n1.csv data/n2.csv
+$CSVED file_merge data/n1.csv data/n1.csv
+$CSVED file_merge data/n1.csv data/n2.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/from_xml.test csvfix-new/csvfix/tests/tests/from_xml.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/from_xml.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/from_xml.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,7 +1,7 @@
-$CSVED from_xml -re 'character' data/books.xml
-$CSVED from_xml -re 'foo' data/paths.xml
-$CSVED from_xml -re 'bar@foo' data/paths.xml
-$CSVED from_xml -re 'bar@foo,other' -ip data/paths.xml
-$CSVED from_xml -re 'tr' data/table.xml
-$CSVED from_xml -re rec -ex done data/nested.xml
-
+$CSVED from_xml -re 'character' data/books.xml
+$CSVED from_xml -re 'foo' data/paths.xml
+$CSVED from_xml -re 'bar@foo' data/paths.xml
+$CSVED from_xml -re 'bar@foo,other' -ip data/paths.xml
+$CSVED from_xml -re 'tr' data/table.xml
+$CSVED from_xml -re rec -ex done data/nested.xml
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/headtail.test csvfix-new/csvfix/tests/tests/headtail.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/headtail.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/headtail.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,10 +1,10 @@
-$CSVED head data/names.csv
-echo "------------------"
-$CSVED head -n 3 data/names.csv
-echo "------------------"
-$CSVED head -n 300 data/names.csv
-echo "------------------"
-$CSVED tail -n 3 data/names.csv
-echo "------------------"
-$CSVED tail -n 300 data/names.csv
-echo "------------------"
+$CSVED head data/names.csv
+echo "------------------"
+$CSVED head -n 3 data/names.csv
+echo "------------------"
+$CSVED head -n 300 data/names.csv
+echo "------------------"
+$CSVED tail -n 3 data/names.csv
+echo "------------------"
+$CSVED tail -n 300 data/names.csv
+echo "------------------"
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/inter.test csvfix-new/csvfix/tests/tests/inter.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/inter.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/inter.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,4 +1,4 @@
-$CSVED inter data/names.csv data/dates.csv
-$CSVED inter -f L1,R2,L3 data/names.csv data/dates.csv
-$CSVED inter -f l1,r2,L3 data/names.csv data/dates.csv
-$CSVED inter -f l1,r2,L3,R1000,L1000 data/names.csv data/dates.csv
+$CSVED inter data/names.csv data/dates.csv
+$CSVED inter -f L1,R2,L3 data/names.csv data/dates.csv
+$CSVED inter -f l1,r2,L3 data/names.csv data/dates.csv
+$CSVED inter -f l1,r2,L3,R1000,L1000 data/names.csv data/dates.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/join.test csvfix-new/csvfix/tests/tests/join.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/join.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/join.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,16 +1,16 @@
-echo ---- equi join ---
-$CSVED join -f 2:1 data/cities.csv data/countries.csv
-echo ---- equi join retaining key fields ---
-$CSVED join -k -f 2:1 data/cities.csv data/countries.csv
-echo ---- exclude GB + NL ----
-$CSVED join -inv -f 2:1 data/cities.csv data/gbnl.csv
-echo ---- join with custom sep ----
-$CSVED join -sep ';' -f 1:1 data/ssjoin1.csv data/ssjoin2.csv
-echo "---- join with custom sep (inverse) ----"
-$CSVED join -sep ';' -inv -f 1:1 data/ssjoin1.csv data/ssjoin3.csv
-echo "---- join issue #12 stuff"
-$CSVED join -sep ';' -inv -f 1:1 data/issue12_1.csv data/issue12_2.csv
-echo "---- join -ic option original data ----"
-$CSVED join -inv -ic -f 2:1 data/cities.csv data/gbnl.csv
-echo "---- join -ic option lowercase data ----"
-$CSVED join -inv -ic -f 2:1 data/cities.csv data/gbnllc.csv
+echo ---- equi join ---
+$CSVED join -f 2:1 data/cities.csv data/countries.csv
+echo ---- equi join retaining key fields ---
+$CSVED join -k -f 2:1 data/cities.csv data/countries.csv
+echo ---- exclude GB + NL ----
+$CSVED join -inv -f 2:1 data/cities.csv data/gbnl.csv
+echo ---- join with custom sep ----
+$CSVED join -sep ';' -f 1:1 data/ssjoin1.csv data/ssjoin2.csv
+echo "---- join with custom sep (inverse) ----"
+$CSVED join -sep ';' -inv -f 1:1 data/ssjoin1.csv data/ssjoin3.csv
+echo "---- join issue #12 stuff"
+$CSVED join -sep ';' -inv -f 1:1 data/issue12_1.csv data/issue12_2.csv
+echo "---- join -ic option original data ----"
+$CSVED join -inv -ic -f 2:1 data/cities.csv data/gbnl.csv
+echo "---- join -ic option lowercase data ----"
+$CSVED join -inv -ic -f 2:1 data/cities.csv data/gbnllc.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/lines.txt csvfix-new/csvfix/tests/tests/lines.txt
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/lines.txt 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/lines.txt 2020-01-23 01:53:23.536606822 +1000
@@ -1,8 +1,8 @@
-foo,1
-foo,2
-foo,3
-zod,1
-foo,4
-zod,2
-zod,3
-foo,5
+foo,1
+foo,2
+foo,3
+zod,1
+foo,4
+zod,2
+zod,3
+foo,5
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/map.test csvfix-new/csvfix/tests/tests/map.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/map.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/map.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,5 +1,5 @@
-$CSVED map -f 1,3 -fv "M,F" -tv "Male,Female" data/names.csv
-$CSVED map -f 1,3 -fv "Jane,M,F,Zod" -tv "JANE,X,Y,Z" data/names.csv
-$CSVED map -fv "Jane,M,F,Zod" -tv "JANE,X,Y,Z" data/names.csv
-$CSVED map -f 2 -fv "" -tv '$1' data/f2empty.csv
-$CSVED map -f 2 -fv "" -tv ' ' data/f2empty.csv
+$CSVED map -f 1,3 -fv "M,F" -tv "Male,Female" data/names.csv
+$CSVED map -f 1,3 -fv "Jane,M,F,Zod" -tv "JANE,X,Y,Z" data/names.csv
+$CSVED map -fv "Jane,M,F,Zod" -tv "JANE,X,Y,Z" data/names.csv
+$CSVED map -f 2 -fv "" -tv '$1' data/f2empty.csv
+$CSVED map -f 2 -fv "" -tv ' ' data/f2empty.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/mdflat.test csvfix-new/csvfix/tests/tests/mdflat.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/mdflat.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/mdflat.test 2020-01-23 01:53:23.536606822 +1000
@@ -1 +1 @@
-$CSVED flatten -me '$fields == 2' data/md.csv
+$CSVED flatten -me '$fields == 2' data/md.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/merge.test csvfix-new/csvfix/tests/tests/merge.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/merge.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/merge.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,5 +1,5 @@
-$CSVED merge -f 1,2 data/names.csv
-$CSVED merge -f 2,3 data/names.csv
-$CSVED merge -f 2,3 -p 1 data/names.csv
-$CSVED merge -f 1,2,3 -s ':' data/names.csv
-$CSVED merge data/names.csv
+$CSVED merge -f 1,2 data/names.csv
+$CSVED merge -f 2,3 data/names.csv
+$CSVED merge -f 2,3 -p 1 data/names.csv
+$CSVED merge -f 1,2,3 -s ':' data/names.csv
+$CSVED merge data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/mline.test csvfix-new/csvfix/tests/tests/mline.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/mline.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/mline.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,2 +1,2 @@
-# test multiline data
-$CSVED echo data/multiline.csv
+# test multiline data
+$CSVED echo data/multiline.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/money.test csvfix-new/csvfix/tests/tests/money.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/money.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/money.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,2 +1,2 @@
-$CSVED money data/monum.csv
-$CSVED money -ts '.', -dp ',' -cs '$' data/monum.csv
+$CSVED money data/monum.csv
+$CSVED money -ts '.', -dp ',' -cs '$' data/monum.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/multi.test csvfix-new/csvfix/tests/tests/multi.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/multi.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/multi.test 2020-01-23 01:53:23.536606822 +1000
@@ -1 +1 @@
-$CSVED read_multi -s '%' data/multiline.txt
+$CSVED read_multi -s '%' data/multiline.txt
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/number.test csvfix-new/csvfix/tests/tests/number.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/number.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/number.test 2020-01-23 01:53:23.536606822 +1000
@@ -1,3 +1,3 @@
-$CSVED number data/monum.csv
-$CSVED number -f 2 data/en_num.csv
-$CSVED number -f 2 -fmt EU data/eu_num.csv
+$CSVED number data/monum.csv
+$CSVED number -f 2 data/en_num.csv
+$CSVED number -f 2 -fmt EU data/eu_num.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/order.test csvfix-new/csvfix/tests/tests/order.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/order.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/order.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,11 +1,11 @@
-$CSVED order -f 1,2 data/names.csv
-$CSVED order -f 1,2 < data/names.csv
-$CSVED order -f 1 data/names.csv
-$CSVED order -f 1,2,3 data/names.csv
-$CSVED order -f 3,2 data/names.csv
-$CSVED order -f 3,1 data/names.csv
-$CSVED order -fn rank,name data/army.csv
-$CSVED order -xf 1,3 data/army.csv
-$CSVED order -f 3:5,1 data/books.csv
-$CSVED order -f 5:3,1 data/books.csv
-$CSVED order -f 4:1 -nc data/sales_quarter.csv
+$CSVED order -f 1,2 data/names.csv
+$CSVED order -f 1,2 < data/names.csv
+$CSVED order -f 1 data/names.csv
+$CSVED order -f 1,2,3 data/names.csv
+$CSVED order -f 3,2 data/names.csv
+$CSVED order -f 3,1 data/names.csv
+$CSVED order -fn rank,name data/army.csv
+$CSVED order -xf 1,3 data/army.csv
+$CSVED order -f 3:5,1 data/books.csv
+$CSVED order -f 5:3,1 data/books.csv
+$CSVED order -f 4:1 -nc data/sales_quarter.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/osep.test csvfix-new/csvfix/tests/tests/osep.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/osep.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/osep.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED order -f 1,2,3 -osep '|' -smq data/names.csv
-$CSVED echo -osep '|' -smq data/symbols.csv
+$CSVED order -f 1,2,3 -osep '|' -smq data/names.csv
+$CSVED echo -osep '|' -smq data/symbols.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/out_join.test csvfix-new/csvfix/tests/tests/out_join.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/out_join.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/out_join.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-# outer join
-$CSVED join -oj -f 2:1 data/cities.csv data/countries.csv
+# outer join
+$CSVED join -oj -f 2:1 data/cities.csv data/countries.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/pad.test csvfix-new/csvfix/tests/tests/pad.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/pad.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/pad.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED pad -n 4 -p NULL data/sales_quarter.csv
-$CSVED truncate -n 2 data/sales_quarter.csv
+$CSVED pad -n 4 -p NULL data/sales_quarter.csv
+$CSVED truncate -n 2 data/sales_quarter.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/pivot.test csvfix-new/csvfix/tests/tests/pivot.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/pivot.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/pivot.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,3 +1,3 @@
-$CSVED pivot -c 2 -r 1 -f 4 -a sum data/pivot.csv
-$CSVED pivot -c 2 -r 1 -f 4 -a count data/pivot.csv
-$CSVED pivot -c 2 -r 1 -f 4 -a avg data/pivot.csv
+$CSVED pivot -c 2 -r 1 -f 4 -a sum data/pivot.csv
+$CSVED pivot -c 2 -r 1 -f 4 -a count data/pivot.csv
+$CSVED pivot -c 2 -r 1 -f 4 -a avg data/pivot.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/printf.test csvfix-new/csvfix/tests/tests/printf.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/printf.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/printf.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,5 +1,5 @@
-$CSVED printf -fmt 'Name: %10.10s %@ Sex: %s' data/names.csv
-$CSVED printf -f 3,1,2 -fmt 'Sex: %s Name: %s %s' data/names.csv
-$CSVED printf -q -fmt 'Name: %s' data/gangsters.csv
-$CSVED printf -f 3,1,2 -fmt 'Sex: %s\nName: %s %s' data/names.csv
-
+$CSVED printf -fmt 'Name: %10.10s %@ Sex: %s' data/names.csv
+$CSVED printf -f 3,1,2 -fmt 'Sex: %s Name: %s %s' data/names.csv
+$CSVED printf -q -fmt 'Name: %s' data/gangsters.csv
+$CSVED printf -f 3,1,2 -fmt 'Sex: %s\nName: %s %s' data/names.csv
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/put.test csvfix-new/csvfix/tests/tests/put.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/put.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/put.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED put -p 2 -v "foo" data/names.csv
-$CSVED put -p 1 -v "@COUNT" data/varfields.csv
+$CSVED put -p 2 -v "foo" data/names.csv
+$CSVED put -p 1 -v "@COUNT" data/varfields.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/read_dsv.test csvfix-new/csvfix/tests/tests/read_dsv.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/read_dsv.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/read_dsv.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,6 +1,6 @@
-$CSVED read_dsv data/sample.dsv
-$CSVED read_dsv -cm data/sample.dsv
-$CSVED read_dsv -f 1000,1001,2000 data/sample.dsv
-$CSVED read_dsv -s '\t' data/tabsep.txt
-$CSVED read_dsv -s ' ' data/spacesep.txt
-$CSVED read_dsv -s ' ' -cm data/spacesep.txt
+$CSVED read_dsv data/sample.dsv
+$CSVED read_dsv -cm data/sample.dsv
+$CSVED read_dsv -f 1000,1001,2000 data/sample.dsv
+$CSVED read_dsv -s '\t' data/tabsep.txt
+$CSVED read_dsv -s ' ' data/spacesep.txt
+$CSVED read_dsv -s ' ' -cm data/spacesep.txt
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/retsep.test csvfix-new/csvfix/tests/tests/retsep.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/retsep.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/retsep.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED order -f 1,2,3 -rsep ';' data/names_sc.csv
-$CSVED echo -rsep ';' -smq data/names_sc2.csv
+$CSVED order -f 1,2,3 -rsep ';' data/names_sc.csv
+$CSVED echo -rsep ';' -smq data/names_sc2.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/rmnew.test csvfix-new/csvfix/tests/tests/rmnew.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/rmnew.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/rmnew.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED rmnew -s ':' data/newline.csv
-$CSVED rmnew -x data/newline.csv
+$CSVED rmnew -s ':' data/newline.csv
+$CSVED rmnew -x data/newline.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/sequence.test csvfix-new/csvfix/tests/tests/sequence.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/sequence.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/sequence.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,4 +1,4 @@
-# test escape command
-$CSVED sequence -n 1000 -p 5 -i 10 data/names.csv
-$CSVED sequence -n 1000 -p 5 -d 10 data/names.csv
-$CSVED sequence -n 1000 -p 5 -i 10 -m "A@Z" data/names.csv
+# test escape command
+$CSVED sequence -n 1000 -p 5 -i 10 data/names.csv
+$CSVED sequence -n 1000 -p 5 -d 10 data/names.csv
+$CSVED sequence -n 1000 -p 5 -i 10 -m "A@Z" data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/shuffle.test csvfix-new/csvfix/tests/tests/shuffle.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/shuffle.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/shuffle.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,3 +1,3 @@
-$CSVED shuffle -rs 1 data/names.csv
-$CSVED shuffle -rs 1 -f 1:3 data/names.csv
-
+$CSVED shuffle -rs 1 data/names.csv
+$CSVED shuffle -rs 1 -f 1:3 data/names.csv
+
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/skippass.test csvfix-new/csvfix/tests/tests/skippass.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/skippass.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/skippass.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED order -skip '$3=="M"' -f 1,2 data/names.csv
-$CSVED order -pass '$3=="M"' -f 1,2 data/names.csv
+$CSVED order -skip '$3=="M"' -f 1,2 data/names.csv
+$CSVED order -pass '$3=="M"' -f 1,2 data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/smoke.test csvfix-new/csvfix/tests/tests/smoke.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/smoke.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/smoke.test 2020-01-23 01:53:23.539940156 +1000
@@ -1 +1 @@
-$CSVED map -f 1,3 -fv "M,F" -tv "Male,Female" data/names.csv
+$CSVED map -f 1,3 -fv "M,F" -tv "Male,Female" data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/sort.test csvfix-new/csvfix/tests/tests/sort.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/sort.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/sort.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,4 +1,4 @@
-# test escape command
-$CSVED sort -f 3,1 data/names.csv
-$CSVED sort -f 1:DS data/names.csv
-$CSVED sort -rh data/names_head.csv
+# test escape command
+$CSVED sort -f 3,1 data/names.csv
+$CSVED sort -f 1:DS data/names.csv
+$CSVED sort -rh data/names_head.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/specquote.test csvfix-new/csvfix/tests/tests/specquote.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/specquote.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/specquote.test 2020-01-23 01:53:23.539940156 +1000
@@ -1 +1 @@
-$CSVED order -f 1,2,3 -sqf 2,3 data/names.csv
+$CSVED order -f 1,2,3 -sqf 2,3 data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/splitregex.test csvfix-new/csvfix/tests/tests/splitregex.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/splitregex.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/splitregex.test 2020-01-23 02:21:59.823256043 +1000
@@ -1 +1 @@
-$CSVED split_regex -f 1 -r '\(.\)\([0-9]*\)\(.*\)' data/splitlen.csv
+$CSVED split_regex -f 1 -r '(.)([0-9]*)(.*)' data/splitlen.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/split.test csvfix-new/csvfix/tests/tests/split.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/split.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/split.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,4 +1,4 @@
-$CSVED split_fixed -f 1 -p 1:4,5:1 data/emp.csv
-$CSVED split_char -f 2 data/emp.csv
-$CSVED split_char -f 2 data/emp.csv
-$CSVED split_char -f 1 -c '::' data/classmem.csv
+$CSVED split_fixed -f 1 -p 1:4,5:1 data/emp.csv
+$CSVED split_char -f 2 data/emp.csv
+$CSVED split_char -f 2 data/emp.csv
+$CSVED split_char -f 1 -c '::' data/classmem.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/splittrans.test csvfix-new/csvfix/tests/tests/splittrans.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/splittrans.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/splittrans.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,2 +1,2 @@
-$CSVED split_char -f 1 -tna data/idname.csv
-$CSVED split_char -f 1 -tan data/nameid.csv
+$CSVED split_char -f 1 -tna data/idname.csv
+$CSVED split_char -f 1 -tan data/nameid.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/sql_delete.test csvfix-new/csvfix/tests/tests/sql_delete.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/sql_delete.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/sql_delete.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,3 +1,3 @@
-# test sql delete generation
-$CSVED sql_delete -t people -w 1:forename,2:surname data/names.csv
-$CSVED sql_delete -t dummy -en -w 1:one,2:two data/sql_ef.csv
+# test sql delete generation
+$CSVED sql_delete -t people -w 1:forename,2:surname data/names.csv
+$CSVED sql_delete -t dummy -en -w 1:one,2:two data/sql_ef.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/sql_insert.test csvfix-new/csvfix/tests/tests/sql_insert.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/sql_insert.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/sql_insert.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,5 +1,5 @@
-# test sql insert generation
-$CSVED sql_insert -t people -f 1:forename,2:surname data/names.csv
-$CSVED sql_insert -t stuff -f 1:name,2:value data/sqlnull.csv
-$CSVED sql_insert -t stuff -f 1:name,2:value -qn data/sqlnull.csv
-$CSVED sql_insert -en -t stuff -f 1:name,2:value data/sql_ef.csv
+# test sql insert generation
+$CSVED sql_insert -t people -f 1:forename,2:surname data/names.csv
+$CSVED sql_insert -t stuff -f 1:name,2:value data/sqlnull.csv
+$CSVED sql_insert -t stuff -f 1:name,2:value -qn data/sqlnull.csv
+$CSVED sql_insert -en -t stuff -f 1:name,2:value data/sql_ef.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/sql_update.test csvfix-new/csvfix/tests/tests/sql_update.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/sql_update.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/sql_update.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,3 +1,3 @@
-# test sql insert generation
-$CSVED sql_update -t people -f 1:forename,2:surname -w 1:forename data/names.csv
-$CSVED sql_update -en -t stuff -f 1:one,2:two -w 1:one data/sql_ef.csv
+# test sql insert generation
+$CSVED sql_update -t people -f 1:forename,2:surname -w 1:forename data/names.csv
+$CSVED sql_update -en -t stuff -f 1:one,2:two -w 1:one data/sql_ef.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/squash.test csvfix-new/csvfix/tests/tests/squash.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/squash.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/squash.test 2020-01-23 01:53:23.539940156 +1000
@@ -1,4 +1,4 @@
-$CSVED squash -f 1 -n 2 data/squash1.csv
-$CSVED squash -f 1,2 -n 3 data/squash2.csv
-$CSVED squash -f 1,2 -n 3 -rn data/squash3.csv
-$CSVED squash -f 1,2 -n 3 -rn -nn 42.0 data/squash4.csv
+$CSVED squash -f 1 -n 2 data/squash1.csv
+$CSVED squash -f 1,2 -n 3 data/squash2.csv
+$CSVED squash -f 1,2 -n 3 -rn data/squash3.csv
+$CSVED squash -f 1,2 -n 3 -rn -nn 42.0 data/squash4.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/stat.test csvfix-new/csvfix/tests/tests/stat.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/stat.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/stat.test 2020-01-23 01:53:56.953273142 +1000
@@ -1,3 +1,3 @@
-$CSVED stat data/names.csv
-$CSVED stat -fs data/army.csv data/books.csv data/numbers.csv
-$CSVED stat -fs -fn data/army.csv
+$CSVED stat data/names.csv
+$CSVED stat -fs data/army.csv data/books.csv data/numbers.csv
+$CSVED stat -fs -fn data/army.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/summary.test csvfix-new/csvfix/tests/tests/summary.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/summary.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/summary.test 2020-01-23 01:53:56.953273142 +1000
@@ -1,3 +1,3 @@
-$CSVED summary -siz data/army.csv
-$CSVED summary -med 1 data/med_even.csv
-$CSVED summary -med 1 data/med_odd.csv
+$CSVED summary -siz data/army.csv
+$CSVED summary -med 1 data/med_even.csv
+$CSVED summary -med 1 data/med_odd.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/template.test csvfix-new/csvfix/tests/tests/template.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/template.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/template.test 2020-01-23 01:53:56.953273142 +1000
@@ -1,3 +1,3 @@
-# test template
-$CSVED template -tf data/template.txt data/names.csv
-$CSVED template -tf data/tplexpr.txt data/names.csv
+# test template
+$CSVED template -tf data/template.txt data/names.csv
+$CSVED template -tf data/tplexpr.txt data/names.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/toxml.test csvfix-new/csvfix/tests/tests/toxml.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/toxml.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/toxml.test 2020-01-23 01:53:56.953273142 +1000
@@ -1,3 +1,3 @@
-$CSVED to_xml -xf data/pets.xsp data/pets.csv
-$CSVED to_xml -xf data/books.xsp data/books.csv
-$CSVED to_xml data/books.csv
+$CSVED to_xml -xf data/pets.xsp data/pets.csv
+$CSVED to_xml -xf data/books.xsp data/books.csv
+$CSVED to_xml data/books.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/trim.test csvfix-new/csvfix/tests/tests/trim.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/trim.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/trim.test 2020-01-23 01:53:56.953273142 +1000
@@ -1,4 +1,4 @@
-$CSVED trim data/spaces.csv
-$CSVED trim -w 1,1,1 data/names.csv
-$CSVED trim -a data/trim2.csv
-$CSVED trim -s data/trim2.csv
+$CSVED trim data/spaces.csv
+$CSVED trim -w 1,1,1 data/names.csv
+$CSVED trim -a data/trim2.csv
+$CSVED trim -s data/trim2.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/unique.test csvfix-new/csvfix/tests/tests/unique.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/unique.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/unique.test 2020-01-23 01:53:56.956606476 +1000
@@ -1,2 +1,2 @@
-$CSVED unique -f 1 data/post.csv
-$CSVED unique -f 1 -d data/post.csv
+$CSVED unique -f 1 data/post.csv
+$CSVED unique -f 1 -d data/post.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/val_fields.test csvfix-new/csvfix/tests/tests/val_fields.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/val_fields.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/val_fields.test 2020-01-23 01:53:56.956606476 +1000
@@ -1,3 +1,3 @@
-$CSVED validate -vf data/val_fields.txt data/val_fields.csv
-$CSVED validate -vf data/val_values.txt data/names.csv
-$CSVED validate -vf data/val_multi.txt data/val_multi.csv
+$CSVED validate -vf data/val_fields.txt data/val_fields.csv
+$CSVED validate -vf data/val_values.txt data/names.csv
+$CSVED validate -vf data/val_multi.txt data/val_multi.csv
diff -ur neilb-csvfix-93804d497be6/csvfix/tests/tests/write_dsv.test csvfix-new/csvfix/tests/tests/write_dsv.test
--- neilb-csvfix-93804d497be6/csvfix/tests/tests/write_dsv.test 2015-02-28 20:47:41.000000000 +1000
+++ csvfix-new/csvfix/tests/tests/write_dsv.test 2020-01-23 01:53:56.956606476 +1000
@@ -1 +1 @@
-$CSVED write_dsv data/names.csv
+$CSVED write_dsv data/names.csv
diff -ur neilb-csvfix-93804d497be6/Makefile csvfix-new/Makefile