diff --git a/col.go b/col.go index 52b412f..e0d73f6 100644 --- a/col.go +++ b/col.go @@ -58,11 +58,12 @@ func (xf *XfRk) String(wb *WorkBook) string { if formatterLower == "general" || strings.Contains(formatter.str, "#") || strings.Contains(formatter.str, ".00") || - strings.Contains(formatterLower, "mm/yy") || - strings.Contains(formatterLower, "dd/yy") || - strings.Contains(formatterLower, "mm.yy") || - strings.Contains(formatterLower, "dd.yy") || - strings.Contains(formatterLower, "дд.гг") { + strings.Contains(formatterLower, "m/y") || + strings.Contains(formatterLower, "d/y") || + strings.Contains(formatterLower, "m.y") || + strings.Contains(formatterLower, "d.y") || + strings.Contains(formatterLower, "h:") || + strings.Contains(formatterLower, "д.г") { //If format contains # or .00 then this is a number return xf.Rk.String() } else { diff --git a/comparexlsxlsx.go b/comparexlsxlsx.go index eab82b2..a161abd 100644 --- a/comparexlsxlsx.go +++ b/comparexlsxlsx.go @@ -8,7 +8,7 @@ import ( ) //Compares xls and xlsx files -func compareXlsXlsx(xlsfilepathname string, xlsxfilepathname string) string { +func CompareXlsXlsx(xlsfilepathname string, xlsxfilepathname string) string { xlsFile, err := Open(xlsfilepathname, "utf-8") if err != nil { return fmt.Sprintf("Cant open xls file: %s", err) @@ -27,8 +27,8 @@ func compareXlsXlsx(xlsfilepathname string, xlsxfilepathname string) string { for row, xlsxRow := range xlsxSheet.Rows { xlsRow := xlsSheet.Row(row) for cell, xlsxCell := range xlsxRow.Cells { - xlsText := xlsRow.Col(cell) xlsxText := xlsxCell.String() + xlsText := xlsRow.Col(cell) if xlsText != xlsxText { //try to convert to numbers xlsFloat, xlsErr := strconv.ParseFloat(xlsText, 64) diff --git a/issue47_test.go b/issue47_test.go index 098604d..1385ad3 100644 --- a/issue47_test.go +++ b/issue47_test.go @@ -18,7 +18,7 @@ func TestIssue47(t *testing.T) { if filepath.Ext(f.Name()) == ".xls" { xlsfilename := f.Name() xlsxfilename := strings.TrimSuffix(xlsfilename, filepath.Ext(xlsfilename)) + ".xlsx" - err := compareXlsXlsx(path.Join(testdatapath, xlsfilename), + err := CompareXlsXlsx(path.Join(testdatapath, xlsfilename), path.Join(testdatapath, xlsxfilename)) if err != "" { t.Fatalf("XLS file %s an XLSX file are not equal: %s", xlsfilename, err) diff --git a/testdata/float.xls b/testdata/float.xls new file mode 100644 index 0000000..dbe9585 Binary files /dev/null and b/testdata/float.xls differ diff --git a/testdata/float.xlsx b/testdata/float.xlsx new file mode 100644 index 0000000..f399236 Binary files /dev/null and b/testdata/float.xlsx differ diff --git a/testdata/times.xls b/testdata/times.xls new file mode 100644 index 0000000..640b74d Binary files /dev/null and b/testdata/times.xls differ diff --git a/testdata/times.xlsx b/testdata/times.xlsx new file mode 100644 index 0000000..8020038 Binary files /dev/null and b/testdata/times.xlsx differ