xinb
/
ip2region_private
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sep args for segment parse

This commit is contained in:
lionsoul2014 2026-05-30 11:02:41 +08:00
parent fac3d0376a
commit 3eb65a2657
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maker/golang/xdb/segment.go
View File

@ -15,9 +15,9 @@ type Segment struct {
Region *Region Region *Region
} }
func ParseSegment(seg string) ([]byte, []byte, string, error) { func ParseSegment(seg string, sep string) ([]byte, []byte, string, error) {
var count = 0 var count = 0
var ps = StringTokenizer(strings.TrimSpace(seg), "|", func(s string, start int) bool { var ps = StringTokenizer(strings.TrimSpace(seg), sep, func(s string, start int) bool {
// CIDR format // CIDR format
if strings.Index(s, "/") > 0 { if strings.Index(s, "/") > 0 {
return false return false
@ -66,7 +66,7 @@ func ParseSegment(seg string) ([]byte, []byte, string, error) {
} }
func SegmentFrom(seg string, cRegion func(string) *Region) (*Segment, error) { func SegmentFrom(seg string, cRegion func(string) *Region) (*Segment, error) {
sip, eip, region, err := ParseSegment(seg) sip, eip, region, err := ParseSegment(seg, "|")
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
maker/golang/xdb/util.go
View File

@ -207,7 +207,7 @@ func IterateSegments(reader io.Reader, autoMerge bool, before func(l string), fi
before(l) before(l)
} }
sip, eip, region, err := ParseSegment(l) sip, eip, region, err := ParseSegment(l, "|")
if err != nil { if err != nil {
return totalCount, mergeCount, err return totalCount, mergeCount, err
} }