* update mod to go1.20

Author: cdutwhu

build.sh

@@ -11,6 +11,14 @@ W=`tput sgr0`
 ORIPATH=`pwd`
 
 cd ./cmd && ./build.sh 
+echo "${G}NRT_SPLITTER BUILT${W}"
+
 cd "$ORIPATH"
 
-echo "${G}NRT_SPLITTER BUILT${W}"
+cp -rf ./data ./build
+cd ./build/data
+unzip -q system_reports.zip 
+rm system_reports.zip
+echo "${Y}test reports are now in the /build/data${Y}"
+
+cd "$ORIPATH"

clean.sh

@@ -11,6 +11,7 @@ rm -rf ./build
 rm -rf ./data/system_reports
 rm -rf ./cmd/out_*
 rm -rf ./cmd/ignore
+rm -rf ./fatal
 
 # delete all binary files
 find . -type f -executable -exec sh -c "file -i '{}' | grep -q 'x-executable; charset=binary'" \; -print | xargs rm -f

cmd/config.toml

@@ -12,7 +12,7 @@ Enabled = true
 IgnoreFolder = "./ignore/"
 OutFolder = "./out_split/"
 Schema = ["School", "YrLevel", "Domain"]
-Split2 = false
+SplitVer2 = false
 
 [[Merge]]
 Enabled = true

cmd/main.go

@@ -8,10 +8,10 @@ import (
 )
 
 func main() {
-	configurations := []string{}
+	config := []string{}
 	if len(os.Args) > 1 {
-		configurations = append(configurations, os.Args[1:]...)
+		config = append(config, os.Args[1:]...)
 	}
-	configurations = append(configurations, "./config.toml")
-	lk.WarnOnErr("%v", splitter.NrtSplit(configurations...))
+	config = append(config, "./config.toml")
+	lk.WarnOnErr("%v", splitter.NrtSplit(config...))
 }

config.go

@@ -44,7 +44,7 @@ func setConfig(fConfigs ...string) {
 	out4Trim = cfg.Path("Trim.OutFolder")
 
 	enableSplit = cfg.Bool("Split.Enabled")
-	bySplit2 = cfg.Bool("Split.Split2")
+	bySplit2 = cfg.Bool("Split.SplitVer2")
 	ignoreFolder4Split = cfg.Path("Split.IgnoreFolder")
 	out4Split = cfg.Path("Split.OutFolder")
 	splitSchema = cfg.Strs("Split.Schema")

config.toml

@@ -12,7 +12,7 @@ Enabled = true
 IgnoreFolder = "./ignore/"
 OutFolder = "./out_split/"
 Schema = ["School", "YrLevel", "Domain"]
-Split2 = true
+SplitVer2 = true
 
 [[Merge]]
 Enabled = true

go.mod

@@ -1,6 +1,6 @@
 module github.com/nsip/dev-nrt-splitter
 
-go 1.19
+go 1.20
 
 require (
 	github.com/digisan/csv-tool v0.2.5

go.sum

@@ -1,6 +1,5 @@
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/digisan/csv-tool v0.2.5 h1:NzKBPkDRFP3etVNEMcHO+KpbM5tEWLfSdys38jaw5bs=
 github.com/digisan/csv-tool v0.2.5/go.mod h1:5rJ9iufLiCYunEDTWS/J60G3O4SLFPL0V8vsm4WKmBI=
 github.com/digisan/fileflatter v0.0.14 h1:j924nXUhvqdwTsDu05OSNevpDbwVCnvyj/rFnyWZ0NM=
@@ -23,8 +22,6 @@ github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
 github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
 github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
@@ -37,13 +34,11 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
 golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
 golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=