}
template<typename T>
-inline int cmp_(T a, T b)
+inline int _cmp(T a, T b)
{
if(a<b)
return -1;
DateTime::DateTime(const TimeStamp &ts)
{
- init(ts);
+ add_raw(ts.raw());
}
-DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz)
+DateTime::DateTime(const TimeStamp &ts, const TimeZone &tz):
+ DateTime(ts)
{
- init(ts);
convert_timezone(tz);
}
-DateTime::DateTime(int y, unsigned char m, unsigned char d)
+DateTime::DateTime(int y, unsigned char m, unsigned char d):
+ DateTime(y, m, d, 0, 0, 0, 0)
+{ }
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s):
+ DateTime(y, m, d, h, n, s, 0)
+{ }
+
+DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u):
+ year(y),
+ month(m),
+ mday(d),
+ hour(h),
+ minute(n),
+ second(s),
+ usec(u)
{
- init(y, m, d, 0, 0, 0, 0);
-}
-
-DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s)
-{
- init(y, m, d, h, n, s, 0);
-}
-
-DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
-{
- init(y, m, d, h, n, s, u);
-}
-
-void DateTime::init(const TimeStamp &ts)
-{
- year = 1970;
- month = 1;
- mday = 1;
- hour = 0;
- minute = 0;
- second = 0;
- usec = 0;
- add_raw(ts.raw());
-}
-
-void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u)
-{
- year = y;
- month = m;
- mday = d;
- hour = h;
- minute = n;
- second = s;
- usec = u;
-
if(usec>=1000000)
throw out_of_range("DateTime::DateTime usec");
if(second>=60)
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}))$");
+ static Regex re("^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(.([0-9]+))?(Z|[-+]([0-9]{2}):([0-9]{2}))$");
RegMatch m = re.match(str);
if(!m)
unsigned hr = lexical_cast<unsigned>(m[4].str);
unsigned minute = lexical_cast<unsigned>(m[5].str);
unsigned second = lexical_cast<unsigned>(m[6].str);
+ unsigned us = 0;
+ const string &sec_frac = m[8].str;
+ if(!sec_frac.empty())
+ {
+ us = lexical_cast<unsigned>(sec_frac);
+ for(unsigned i=sec_frac.size(); i<6; ++i)
+ us *= 10;
+ for(unsigned i=sec_frac.size(); i>6; --i)
+ us /= 10;
+ }
- DateTime result = DateTime(year, month, mday, hr, minute, second);
+ DateTime result = DateTime(year, month, mday, hr, minute, second, us);
int tzoff = 0;
- if(m[7].str!="Z")
+ if(m[9].str!="Z")
{
- tzoff = lexical_cast<unsigned>(m[8].str)*60+lexical_cast<unsigned>(m[9].str);
- if(m[7].str[0]=='-')
+ tzoff = lexical_cast<unsigned>(m[10].str)*60+lexical_cast<unsigned>(m[11].str);
+ if(m[9].str[0]=='-')
tzoff = -tzoff;
}
int DateTime::cmp(const DateTime &dt) const
{
- if(int c = cmp_(year, dt.year))
+ if(int c = _cmp(year, dt.year))
return c;
- if(int c = cmp_(month, dt.month))
+ if(int c = _cmp(month, dt.month))
return c;
- if(int c = cmp_(mday, dt.mday))
+ if(int c = _cmp(mday, dt.mday))
return c;
- if(int c = cmp_(hour, dt.hour))
+ if(int c = _cmp(hour, dt.hour))
return c;
- if(int c = cmp_(minute, dt.minute))
+ if(int c = _cmp(minute, dt.minute))
return c;
- if(int c = cmp_(second, dt.second))
+ if(int c = _cmp(second, dt.second))
return c;
- if(int c = cmp_(usec, dt.usec))
+ if(int c = _cmp(usec, dt.usec))
return c;
return 0;
}
string DateTime::format(const string &fmt) const
{
string result;
- for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
+ for(auto i=fmt.begin(); i!=fmt.end(); ++i)
{
if(*i=='%')
{
string DateTime::format_rfc3339() const
{
string result = format("%Y-%m-%dT%H:%M:%S");
+ if(usec)
+ result += Msp::format(".%06d", usec);
if(const TimeDelta &offs = zone.get_offset())
{
int m = abs(static_cast<int>(offs/Time::min));