mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

csv: fix field multiple lines error

Browse Source
This commit is contained in:
yuyi
2020-05-10 20:19:26 +08:00
committed by GitHub
parent eabc72d4fe
commit 0606d26ba7
2 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
vlib/encoding/csv/reader.v
View File

@ -98,27 +98,32 @@ fn (r mut Reader) read_record() ?[]string {
if !valid_delim(r.delimiter) {
return err_invalid_delim
}
mut need_read := true
mut keep_raw := false
mut line := ''
for {
l := r.read_line() or {
return error(err)
}
if l.len <= 0 {
continue
}
line = l
// skip commented lines
if line[0] == r.comment {
continue
}
break
}
mut fields := []string{}
mut i := -1
for {
// not quoted
if line[0] != `"` {
// QTODO i = ...
if need_read {
l := r.read_line() or {
return error(err)
}
if l.len <= 0 {
if keep_raw { line += '\n'}
continue
} else if l[0] == r.comment {
if keep_raw { line += '\n' + l }
continue
} else {
if keep_raw { line += '\n'}
line += l
}
need_read = false
keep_raw = false
}
if line[0] != `"` { // not quoted
j := line.index(r.delimiter.str()) or {
// last
fields << line[..line.len]
@ -128,13 +133,13 @@ fn (r mut Reader) read_record() ?[]string {
fields << line[..i]
line = line[i+1..]
continue
}
// quoted
else {
line = line[1..]
j := line.index('"') or {
break
} else { // quoted
j := line[1..].index('"') or {
need_read = true
keep_raw = true
continue
}
line = line[1..]
if j+1 == line.len {
// last record
fields << line[..j]