X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=26bd7cdb7d59925a0caf076b22dab059e8498a60;hb=1a563cfd722a5571428562259790b4948980dd4f;hp=415ce40abcdbd9dd7b4e2a61c2ebe995711413cb;hpb=1cd1a0e185ba31cf89c72dcecbd15c7a5b3b7060;p=libs%2Fcore.git

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 415ce40..26bd7cd 100644
--- 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,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<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);
+
+	DateTime result = DateTime(year, month, mday, hr, minute, second);
+
+	int tzoff = 0;
+	if(m[7].str!="Z")
+	{
+		tzoff = lexical_cast<unsigned>(m[8].str)*60+lexical_cast<unsigned>(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;
@@ -128,7 +151,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 +178,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
@@ -186,7 +209,7 @@ void DateTime::set_timezone(const TimeZone &tz)
 
 void DateTime::convert_timezone(const TimeZone &tz)
 {
-	add_raw((zone.get_offset()-tz.get_offset()).raw());
+	add_raw((tz.get_offset()-zone.get_offset()).raw());
 	zone = tz;
 }
 
@@ -296,7 +319,7 @@ string DateTime::format_rfc3339() const
 	if(const TimeDelta &offs = zone.get_offset())
 	{
 		int m = abs(static_cast<int>(offs/Time::min));
-		result += Msp::format("%c%02d:%02d", (offs<zero ? '+' : '-'), m/60, m%60);
+		result += Msp::format("%c%02d:%02d", (offs<zero ? '-' : '+'), m/60, m%60);
 	}
 	else
 		result += 'Z';
@@ -313,10 +336,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();