Problème de reconnaissance des champs ?

csvparser.go

@@ -6,13 +6,13 @@ import (
 	"unicode/utf8"
 )
 
-type Parser struct {
+type CsvParser struct {
 	enclosers []string
 	delimiter rune
 	fields    []string
 }
 
-func (p *Parser) Initialize(delimiter string, enclosers []string, lineFormat string) error {
+func (p *CsvParser) Initialize(delimiter string, enclosers []string, lineFormat string) error {
 	if utf8.RuneCountInString(delimiter) != 1 {
 		return fmt.Errorf("delimiter shoud be one character")
 	}
@@ -36,23 +36,40 @@ func (p *Parser) Initialize(delimiter string, enclosers []string, lineFormat str
 	return nil
 }
 
-func (p *Parser) Parse(line string) (map[string]string, error) {
+func (p *CsvParser) Parse(line string) (map[string]string, error) {
+	inEnclosedField := false
+	currentEncloserEnd := ' '
+	escape := false
 	currentFieldIndex := 0
+
 	ret := make(map[string]string)
-	value := ""
+	valueStart := 0
+	valueEnd := 0
 	for index, r := range line {
-		if r == p.delimiter {
+		if r == '\\' {
+			escape = !escape
+		} else if inEnclosedField {
+			if r == currentEncloserEnd && !escape {
+				if currentFieldIndex < len(p.fields) {
+					ret[p.fields[currentFieldIndex]] = line[valueStart : valueEnd-valueStart]
+				}
+				currentFieldIndex++
+				inEnclosedField = false
+			}
+		} else if r == p.delimiter {
+			valueEnd = index
+			if currentFieldIndex < len(p.fields) {
+				ret[p.fields[currentFieldIndex]] = line[valueStart : valueEnd-valueStart]
+			}
 			currentFieldIndex++
-			ret[p.fields[currentFieldIndex]] = value
-			continue
-		}
-		for _, encloser := range p.enclosers {
-			runes := []rune(encloser)
-			if r == runes[0] {
-				// opening encloser
-				tmpStr := line[index:]
-				for tmpIndex, tmpR := range tmpStr {
-					
+		} else {
+			for _, encloser := range p.enclosers {
+				runes := []rune(encloser)
+				if r == runes[0] {
+					// opening encloser
+					inEnclosedField = true
+					currentEncloserEnd = runes[1]
+					break
 				}
 			}
 		}