This commit is contained in:
parent
f5c589127a
commit
f9b8ec213a
28
csvparser.go
28
csvparser.go
|
@ -7,19 +7,22 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
type Parser struct {
|
type Parser struct {
|
||||||
enclosers [][]rune
|
enclosers []string
|
||||||
delimiter rune
|
delimiter rune
|
||||||
fields []string
|
fields []string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Parser) Initialize(delimiter string, enclosers []string, lineFormat string) error {
|
func (p *Parser) Initialize(delimiter string, enclosers []string, lineFormat string) error {
|
||||||
if utf8.RuneCountInString(delimiter) != 1 {
|
if utf8.RuneCountInString(delimiter) != 1 {
|
||||||
return fmt.Errorf("delimiter shoud be 1 char length")
|
return fmt.Errorf("delimiter shoud be one character")
|
||||||
}
|
}
|
||||||
p.enclosers = make([][]rune, 0)
|
p.enclosers = make([]string, 0)
|
||||||
for _, str := range enclosers {
|
for _, encloser := range enclosers {
|
||||||
p.enclosers = append(p.enclosers, []rune(str))
|
if utf8.RuneCountInString(encloser) != 2 {
|
||||||
|
return fmt.Errorf("encolser should have to characters")
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
p.enclosers = enclosers
|
||||||
p.delimiter = []rune(delimiter)[0]
|
p.delimiter = []rune(delimiter)[0]
|
||||||
for _, pair := range enclosers {
|
for _, pair := range enclosers {
|
||||||
if utf8.RuneCountInString(pair) != 2 {
|
if utf8.RuneCountInString(pair) != 2 {
|
||||||
|
@ -34,13 +37,24 @@ func (p *Parser) Initialize(delimiter string, enclosers []string, lineFormat str
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Parser) Parse(line string) (map[string]string, error) {
|
func (p *Parser) Parse(line string) (map[string]string, error) {
|
||||||
|
currentFieldIndex := 0
|
||||||
ret := make(map[string]string)
|
ret := make(map[string]string)
|
||||||
|
value := ""
|
||||||
for index, r := range line {
|
for index, r := range line {
|
||||||
if r == p.delimiter {
|
if r == p.delimiter {
|
||||||
|
currentFieldIndex++
|
||||||
|
ret[p.fields[currentFieldIndex]] = value
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
for _, encloser := range p.enclosers {
|
for _, encloser := range p.enclosers {
|
||||||
runes = []rune(encloser)
|
runes := []rune(encloser)
|
||||||
|
if r == runes[0] {
|
||||||
|
// opening encloser
|
||||||
|
tmpStr := line[index:]
|
||||||
|
for tmpIndex, tmpR := range tmpStr {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue