uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Adding eamon special timestamp format

Browse Source
This commit is contained in:
DanB
2015-07-02 16:35:58 +02:00
parent b66a8e6b44
commit 0b3cf7db1a
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/coreutils.go
View File

@@ -137,6 +137,7 @@ func ParseTimeDetectLayout(tmStr string) (time.Time, error) {
unixTimestampRule := regexp.MustCompile(`^\d{10}$`)
oneLineTimestampRule := regexp.MustCompile(`^\d{14}$`)
oneSpaceTimestampRule := regexp.MustCompile(`^\d{2}\.\d{2}.\d{4}\s{1}\d{2}:\d{2}:\d{2}$`)
eamonTimestampRule := regexp.MustCompile(`^\d{2}/\d{2}/\d{4}\s{1}\d{2}:\d{2}:\d{2}$`)
switch {
case rfc3339Rule.MatchString(tmStr):
return time.Parse(time.RFC3339, tmStr)
@@ -162,6 +163,8 @@ func ParseTimeDetectLayout(tmStr string) (time.Time, error) {
return time.Parse("20060102150405", tmStr)
case oneSpaceTimestampRule.MatchString(tmStr):
return time.Parse("02.01.2006 15:04:05", tmStr)
case eamonTimestampRule.MatchString(tmStr):
return time.Parse("02/01/2006 15:04:05", tmStr)
case tmStr == "*now":
return time.Now(), nil
}

8
utils/utils_test.go
View File

@@ -224,6 +224,14 @@ func TestParseTimeDetectLayout(t *testing.T) {
} else if time.Now().Sub(nowTm) > time.Duration(1)*time.Millisecond {
t.Errorf("Unexpected time parsed: %v", nowTm)
}
eamonTmStr := "31/05/2015 14:46:00"
eamonTmS, err := ParseTimeDetectLayout(eamonTmStr)
expectedTime = time.Date(2015, 5, 31, 14, 46, 0, 0, time.UTC)
if err != nil {
t.Error(err)
} else if !eamonTmS.Equal(expectedTime) {
t.Errorf("Unexpected time parsed: %v, expecting: %v", eamonTmS, expectedTime)
}
}
func TestParseDateUnix(t *testing.T) {