Remove useless `.xlsx` tested files and go test updated.

excelize_test.go

@@ -11,6 +11,16 @@ func TestExcelize(t *testing.T) {
 	if err != nil {
 		t.Log(err)
 	}
+	// Test get all the rows in a not exists sheet.
+	rows := f1.GetRows("Sheet4")
+	// Test get all the rows in a sheet.
+	rows = f1.GetRows("Sheet2")
+	for _, row := range rows {
+		for _, cell := range row {
+			t.Log(cell, "\t")
+		}
+		t.Log("\r\n")
+	}
 	f1.UpdateLinkedValue()
 	f1.SetCellInt("SHEET2", "A1", 100)
 	f1.SetCellStr("SHEET2", "C11", "Knowns")

rows.go

@@ -2,49 +2,63 @@ package excelize
 
 import (
 	"encoding/xml"
+	"strconv"
 	"strings"
-  "strconv"
 )
 
-
-// GetRows return all the rows in a sheet
-func (f *File) GetRows(sheet string) ([]xlsxRow, error) {
-	var xlsx xlsxWorksheet
+// GetRows return all the rows in a sheet, for example:
+//
+//    rows := xlsx.GetRows("Sheet2")
+//    for _, row := range rows {
+//        for _, colCell := range row {
+//            fmt.Print(colCell, "\t")
+//        }
+//        fmt.Println()
+//    }
+//
+func (f *File) GetRows(sheet string) [][]string {
+	xlsx := xlsxWorksheet{}
+	r := [][]string{}
 	name := `xl/worksheets/` + strings.ToLower(sheet) + `.xml`
 	err := xml.Unmarshal([]byte(f.readXML(name)), &xlsx)
-	if ( err != nil ) {
-		return nil, err
+	if err != nil {
+		return r
 	}
 	rows := xlsx.SheetData.Row
-
-	return rows, nil
-
+	for _, row := range rows {
+		c := []string{}
+		for _, colCell := range row.C {
+			val, _ := colCell.getValueFrom(f)
+			c = append(c, val)
+		}
+		r = append(r, c)
+	}
+	return r
 }
 
-
-// readXMLSST read xmlSST simple function
+// readXMLSST read xmlSST simple function.
 func readXMLSST(f *File) (xlsxSST, error) {
 	shardStrings := xlsxSST{}
 	err := xml.Unmarshal([]byte(f.readXML(`xl/sharedStrings.xml`)), &shardStrings)
 	return shardStrings, err
 }
 
-// GetValueFrom return a value from a column/row cell,
+// getValueFrom return a value from a column/row cell,
 // this function is inteded to be used with for range on rows
-// an argument with the xlsx opened file
-func (self* xlsxC) GetValueFrom(f *File) (string, error) {
-  switch self.T {
-    case "s":
-      xlsxSI := 0
-      xlsxSI, _ = strconv.Atoi(self.V)
-      d, err := readXMLSST(f)
-      if ( err != nil ) {
-        return "", err
-      }
-      return d.SI[xlsxSI].T, nil
-    case "str":
-      return self.V, nil
-    default:
-      return self.V, nil
-  } // switch
+// an argument with the xlsx opened file.
+func (xlsx *xlsxC) getValueFrom(f *File) (string, error) {
+	switch xlsx.T {
+	case "s":
+		xlsxSI := 0
+		xlsxSI, _ = strconv.Atoi(xlsx.V)
+		d, err := readXMLSST(f)
+		if err != nil {
+			return "", err
+		}
+		return d.SI[xlsxSI].T, nil
+	case "str":
+		return xlsx.V, nil
+	default:
+		return xlsx.V, nil
+	}
 }