util006

cgimport.conf

@@ -1,4 +1,7 @@
 
+[log]
+level=debug
+
 [cgi]
 datapath=
 parallel=20

go.mod

@@ -3,11 +3,11 @@ module git.wecise.com/wecise/cgimport
 go 1.22.0
 
 require (
-	git.wecise.com/wecise/odb-go v0.0.0-20250214061801-e90507de9e38
+	git.wecise.com/wecise/odb-go v0.0.0-20250216043918-3dfdeaa665d0
 	github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da
 	github.com/scylladb/go-set v1.0.2
 	github.com/spf13/cast v1.7.1
-	github.com/wecisecode/util v0.0.4
+	github.com/wecisecode/util v0.0.6
 	modernc.org/sqlite v1.35.0
 )
 

go.sum

@@ -1,5 +1,5 @@
-git.wecise.com/wecise/odb-go v0.0.0-20250214061801-e90507de9e38 h1:W6+d6z2ag94w/F4EI0Gk6VLg8QA+sRIzH4H4m5u63zo=
-git.wecise.com/wecise/odb-go v0.0.0-20250214061801-e90507de9e38/go.mod h1:9kaLNpfwPZKW2pVxbPHXEzDvEblfCbInKUX2eve1OX4=
+git.wecise.com/wecise/odb-go v0.0.0-20250216043918-3dfdeaa665d0 h1:xzJ80y712w31P8jWmEll0NoFtG9ddpFkUVR54seCnbM=
+git.wecise.com/wecise/odb-go v0.0.0-20250216043918-3dfdeaa665d0/go.mod h1:SKS8LuZC0/lkoIjObhBeKZrKfUcy5AaSjbkdtY0bh3c=
 github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
 github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
@@ -81,8 +81,8 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU
 github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
 github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
-github.com/wecisecode/util v0.0.4 h1:z51nlZdMQynhSmw1l9/oVFGRxPuQY2FsGwUNPbxIEsQ=
-github.com/wecisecode/util v0.0.4/go.mod h1:3uYUTKKfdmgudEAYCam/38H1LtHTxnD7ly9kGf0Tzp0=
+github.com/wecisecode/util v0.0.6 h1:W4/D32N9XIE3bNeXYqmBrb+P1CEJdEDCd+tmLbUMoa8=
+github.com/wecisecode/util v0.0.6/go.mod h1:3uYUTKKfdmgudEAYCam/38H1LtHTxnD7ly9kGf0Tzp0=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/etcd/api/v3 v3.5.18 h1:Q4oDAKnmwqTo5lafvB+afbgCDF7E35E4EYV2g+FNGhs=

importer/importer.go

@@ -53,7 +53,7 @@ func ImportDir(datapath string, parallel int, rebuild, reload bool) (totalfilesc
 }
 
 func (importer *Importer) Import() (totalfilescount, totallinecount, totalrecordscount, totalretrycount int64, totalusetime time.Duration, filescount, linescount, recordscount, retrycount int64, usetime time.Duration, err error) {
-	if odbc.DevPhase&odbc.DP_PROCESSCONTINUE != 0 && !importer.reload {
+	if odbc.DevPhase&odbc.DP_PROCESSCONTINUE != 0 && !importer.reload && !importer.rebuild {
 		// reload
 		err = importer.importstatus.Load()
 		if err != nil {
@@ -352,7 +352,7 @@ func (importer *Importer) importRecord(record map[string]any, line string, filen
 		if e != nil {
 			return 0, merrs.NewError(e)
 		}
-		logger.Debug(fmt.Sprint("import ", filename, "[", linecount, "]:", string(bs)))
+		logger.Trace(fmt.Sprint("import ", filename, "[", linecount, "]:", string(bs)))
 	}
 	var classaliasname string
 	switch filetype {