fix xio map generation

1 files changed, 11 insertions, 8 deletions

diff --git a/skate/xio/util.go b/skate/xio/util.go
index 681f260..19651f4 100644
--- a/skate/xio/util.go
+++ b/skate/xio/util.go
@@ -23,24 +23,27 @@ func OpenTwo(f1, f2 string) (g1, g2 *os.File, err error) {
 // mapping.
 func TabsToMap(r io.Reader, sep string, kCol, vCol int) (map[string]string, error) {
 	var (
-		br = bufio.NewReader(r)
-		m  = make(map[string]string)
+		br         = bufio.NewReader(r)
+		m          = make(map[string]string)
+		line, k, v string
+		fields     []string
+		err        error
 	)
 	for {
-		line, err := br.ReadString('\n')
+		line, err = br.ReadString('\n')
 		if err == io.EOF {
 			return m, nil
 		}
 		if err != nil {
 			return nil, err
 		}
-		fields := strings.Split(line, sep)
-		if len(fields) <= kCol && len(fields) <= vCol {
-			k := strings.TrimSpace(fields[kCol-1])
-			v := strings.TrimSpace(fields[vCol-1])
+		fields = strings.Split(line, sep)
+		if len(fields) > kCol-1 && len(fields) > vCol-1 {
+			k = strings.TrimSpace(fields[kCol-1])
+			v = strings.TrimSpace(fields[vCol-1])
 			m[k] = v
 		} else {
-			return nil, fmt.Errorf("invalid line: %v", line)
+			return nil, fmt.Errorf("invalid line: %v (%v fields, %v, %v)", line, len(fields), kCol, vCol)
 		}
 	}
 	return m, nil