Add microsecond precision to RFC 3339 dates

[libs/core.git] / source / time / datetime.cpp

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 7fa8ceefbac56c0ac5b7507906ff15b0df1f8d31..e8170cc0246d26393b34d2d102d7005aa6d91e2e 100644 (file)
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of libmspcore     
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cstdlib>
 #include <stdexcept>
 #include <msp/strings/format.h>
+#include <msp/strings/regex.h>
 #include "datetime.h"
 #include "timestamp.h"
-#include "units.h"
 
 using namespace std;
 
@@ -112,6 +105,46 @@ 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})(.([0-9]+))?(Z|[-+]([0-9]{2}):([0-9]{2}))$");
+
+       RegMatch m = re.match(str);
+       if(!m)
+               throw invalid_argument("DateTime::parse_rfc3339");
+
+       unsigned year = lexical_cast<unsigned>(m[1].str);
+       unsigned month = lexical_cast<unsigned>(m[2].str);
+       unsigned mday = lexical_cast<unsigned>(m[3].str);
+       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, us);
+
+       int tzoff = 0;
+       if(m[9].str!="Z")
+       {
+               tzoff = lexical_cast<unsigned>(m[10].str)*60+lexical_cast<unsigned>(m[11].str);
+               if(m[9].str[0]=='-')
+                       tzoff = -tzoff;
+       }
+
+       result.set_timezone(tzoff);
+
+       return result;
+}
+
 void DateTime::add_days(int days)
 {
        int new_year = year;
@@ -128,7 +161,7 @@ void DateTime::add_days(int days)
        }
 
        // Fudge factor for leap day
-       int fudge = (month<=2)?1:0;
+       int fudge = (month<=2) ? 1 : 0;
 
        // (Almost) every 4 year cycle has 1 leap year and 3 normal years
        unsigned cycles = days/1461;
@@ -155,7 +188,7 @@ void DateTime::add_days(int days)
                // We passed a leap year - decrement days
                if(days==0)
                {
-                       days = is_leap_year(new_year-fudge)?365:364;
+                       days = is_leap_year(new_year-fudge) ? 365 : 364;
                        --new_year;
                }
                else
@@ -293,6 +326,8 @@ string DateTime::format(const string &fmt) const
 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));
@@ -313,10 +348,10 @@ void DateTime::add_raw(RawTime raw)
                raw += 86400000000LL;
        }
 
-       usec+=raw%1000000; raw /= 1000000;
-       second+=raw%60;    raw /= 60;
-       minute+=raw%60;    raw /= 60;
-       hour+=raw%24;      raw /= 24;
+       usec += raw%1000000; raw /= 1000000;
+       second += raw%60;    raw /= 60;
+       minute += raw%60;    raw /= 60;
+       hour += raw%24;      raw /= 24;
 
        add_days(days);
        normalize();