From: Mikko Rasa Date: Sun, 24 Jul 2016 14:24:01 +0000 (+0300) Subject: Add conversion from RFC3339 string to DateTime X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=d716073b5f2e2fcc518d53ec6ef09c5971b6d0e4;p=libs%2Fcore.git Add conversion from RFC3339 string to DateTime --- diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp index c77796f..26bd7cd 100644 --- a/source/time/datetime.cpp +++ b/source/time/datetime.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "datetime.h" #include "timestamp.h" @@ -104,6 +105,36 @@ void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, un throw out_of_range("DateTime::DateTime mday"); } +DateTime DateTime::parse_rfc3339(const string &str) +{ + static Regex re("^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[-+]([0-9]{2}):([0-9]{2}))$"); + + RegMatch m = re.match(str); + if(!m) + throw invalid_argument("DateTime::parse_rfc3339"); + + unsigned year = lexical_cast(m[1].str); + unsigned month = lexical_cast(m[2].str); + unsigned mday = lexical_cast(m[3].str); + unsigned hr = lexical_cast(m[4].str); + unsigned minute = lexical_cast(m[5].str); + unsigned second = lexical_cast(m[6].str); + + DateTime result = DateTime(year, month, mday, hr, minute, second); + + int tzoff = 0; + if(m[7].str!="Z") + { + tzoff = lexical_cast(m[8].str)*60+lexical_cast(m[9].str); + if(m[7].str[0]=='-') + tzoff = -tzoff; + } + + result.set_timezone(tzoff); + + return result; +} + void DateTime::add_days(int days) { int new_year = year; diff --git a/source/time/datetime.h b/source/time/datetime.h index f065d32..b7f578c 100644 --- a/source/time/datetime.h +++ b/source/time/datetime.h @@ -43,6 +43,8 @@ private: void init(int, unsigned char, unsigned char, unsigned char, unsigned char, unsigned char, unsigned); public: + static DateTime parse_rfc3339(const std::string &); + int get_year() const { return year; } unsigned char get_month() const { return month; } unsigned char get_mday() const { return mday; } @@ -80,6 +82,9 @@ private: inline void operator<<(LexicalConverter &c, const DateTime &d) { c.result(d.format_rfc3339()); } +inline void operator>>(const LexicalConverter &c, DateTime &d) +{ d = DateTime::parse_rfc3339(c.get()); } + } // namespace Time } // namespace Msp