p71924506
/
excelize
forked from p30928647/excelize
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restore date 32bit compatibility, be more verbose 

Do not use large int64 constants that are not available in GOARCH=386
Fix #239
This commit is contained in:
Mārtiņš 2018-06-26 16:33:21 +03:00 committed by lietotajs
parent 3a91b28ddb
commit 4855a43bc6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
date.go
View File

@ -17,12 +17,13 @@ func timeToUTCTime(t time.Time) time.Time {
func timeToExcelTime(t time.Time) float64 { func timeToExcelTime(t time.Time) float64 {
// TODO in future this should probably also handle date1904 and like TimeFromExcelTime // TODO in future this should probably also handle date1904 and like TimeFromExcelTime
var excelTime float64 var excelTime float64
var deltaDays int64
excelTime = 0 excelTime = 0
deltaDays = 290 * 364
// check if UnixNano would be out of int64 range // check if UnixNano would be out of int64 range
for t.Unix() > 9223372036 { for t.Unix() > deltaDays*24*60*60 {
// reduce by aprox. 290 years, which is max for int64 nanoseconds // reduce by aprox. 290 years, which is max for int64 nanoseconds
deltaDays := 290 * 364 delta := time.Duration(deltaDays) * 24 * time.Hour
delta := time.Duration(deltaDays * 8.64e13)
excelTime = excelTime + float64(deltaDays) excelTime = excelTime + float64(deltaDays)
t = t.Add(-delta) t = t.Add(-delta)
} }
@ -103,7 +104,7 @@ func doTheFliegelAndVanFlandernAlgorithm(jd int) (day, month, year int) {
// timeFromExcelTime provides function to convert an excelTime representation // timeFromExcelTime provides function to convert an excelTime representation
// (stored as a floating point number) to a time.Time. // (stored as a floating point number) to a time.Time.
func timeFromExcelTime(excelTime float64, date1904 bool) time.Time { func timeFromExcelTime(excelTime float64, date1904 bool) time.Time {
const MDD int64 = 106750 // Max time.Duration Days, aprox. 290 years const MDD int64 = 106750 // Max time.Duration Days, aprox. 290 years
var date time.Time var date time.Time
var intPart = int64(excelTime) var intPart = int64(excelTime)
// Excel uses Julian dates prior to March 1st 1900, and Gregorian // Excel uses Julian dates prior to March 1st 1900, and Gregorian
@ -127,7 +128,7 @@ func timeFromExcelTime(excelTime float64, date1904 bool) time.Time {
} else { } else {
date = time.Date(1899, 12, 30, 0, 0, 0, 0, time.UTC) date = time.Date(1899, 12, 30, 0, 0, 0, 0, time.UTC)
} }
// Duration is limited to aprox. 290 years // Duration is limited to aprox. 290 years
for intPart > MDD { for intPart > MDD {
durationDays := time.Duration(MDD) * time.Hour * 24 durationDays := time.Duration(MDD) * time.Hour * 24