X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=e8170cc0246d26393b34d2d102d7005aa6d91e2e;hb=9c8bb278a26c0c4356d6ee5e66d3f34c70521fb8;hp=c77796f7bc0bd8c8cd378d739fb5a458f006a491;hpb=b4806214e905752617691f851717033fd3f266c2;p=libs%2Fcore.git

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index c77796f..e8170cc 100644
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -1,6 +1,7 @@
 #include <cstdlib>
 #include <stdexcept>
 #include <msp/strings/format.h>
+#include <msp/strings/regex.h>
 #include "datetime.h"
 #include "timestamp.h"
 
@@ -104,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;
@@ -285,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));