go/grate
1
0
Fork 0
mirror of https://github.com/pbnjay/grate.git synced 2024-12-12 13:35:18 +02:00
Code Issues Releases Activity

off-by-one errors on both side of last refactor

Browse Source
This commit is contained in:
Jeremy Jay 2021-02-23 08:19:15 -05:00
parent 88aeec74f8
commit 460301037b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commonxl/sheet.go
View File

@ -85,7 +85,7 @@ func (s *Sheet) SetURL(row, col int, link string) {
// Next advances to the next record of content.
// It MUST be called prior to any Scan().
func (s *Sheet) Next() bool {
if (s.CurRow + 1) >= len(s.Rows) {
if (s.CurRow + 1) > len(s.Rows) {
return false
}
s.CurRow++
@ -95,7 +95,7 @@ func (s *Sheet) Next() bool {
// Strings extracts values from the current record into a list of strings.
func (s *Sheet) Strings() []string {
res := make([]string, s.NumCols)
for i, cell := range s.Rows[s.CurRow] {
for i, cell := range s.Rows[s.CurRow-1] {
if cell.Type() == BlankCell {
res[i] = ""
continue
@ -115,7 +115,7 @@ func (s *Sheet) Strings() []string {
// and special cases: "blank", "hyperlink" which are string types
func (s *Sheet) Types() []string {
res := make([]string, s.NumCols)
for i, cell := range s.Rows[s.CurRow] {
for i, cell := range s.Rows[s.CurRow-1] {
res[i] = cell.Type().String()
}
return res
@ -126,7 +126,7 @@ func (s *Sheet) Types() []string {
// bool, int64, float64, string, or time.Time
// If invalid, returns ErrInvalidScanType
func (s *Sheet) Scan(args ...interface{}) error {
row := s.Rows[s.CurRow]
row := s.Rows[s.CurRow-1]
for i, a := range args {
val := row[i].Value()

4
xlsx/types.go
View File

@ -68,7 +68,7 @@ func refToIndexes(r string) (column, row int) {
i2 := strings.IndexByte(r[i1:], 'C')
if i2 == -1 {
rn, _ := strconv.ParseInt(r[i1:], 10, 64)
return col2int(col1), int(rn)
return col2int(col1), int(rn) - 1
}
// R1C1 Reference Mode
@ -76,7 +76,7 @@ func refToIndexes(r string) (column, row int) {
row1 := r[i2+1:]
cn, _ := strconv.ParseInt(col1, 10, 64)
rn, _ := strconv.ParseInt(row1, 10, 64)
return int(cn), int(rn)
return int(cn), int(rn) - 1
}
func getAttrs(attrs []xml.Attr, keys ...string) []string {