X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=7fa8ceefbac56c0ac5b7507906ff15b0df1f8d31;hb=90d55c510f5dbd334be3a16017d1cf6ece61cf85;hp=13fba6332b25d8898abbb76066392b629aa43a19;hpb=fe8c3e73b5d9147d400c2b7d2e35ebfc64fc7b9d;p=libs%2Fcore.git

diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp
index 13fba63..7fa8cee 100644
--- a/source/time/datetime.cpp
+++ b/source/time/datetime.cpp
@@ -6,9 +6,8 @@ Distributed under the LGPL
 */
 
 #include <cstdlib>
-#include <sstream>
-#include <iomanip>
-#include "../core/except.h"
+#include <stdexcept>
+#include <msp/strings/format.h>
 #include "datetime.h"
 #include "timestamp.h"
 #include "units.h"
@@ -100,17 +99,17 @@ void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, un
 	usec = u;
 
 	if(usec>=1000000)
-		throw InvalidParameterValue("Microseconds out of range");
+		throw out_of_range("DateTime::DateTime usec");
 	if(second>=60)
-		throw InvalidParameterValue("Seconds out of range");
+		throw out_of_range("DateTime::DateTime second");
 	if(minute>=60)
-		throw InvalidParameterValue("Minutes out of range");
+		throw out_of_range("DateTime::DateTime minute");
 	if(hour>=24)
-		throw InvalidParameterValue("Hours out of range");
+		throw out_of_range("DateTime::DateTime hour");
 	if(month<1 || month>12)
-		throw InvalidParameterValue("Month out of range");
+		throw out_of_range("DateTime::DateTime month");
 	if(mday<1 || mday>month_days(year, month))
-		throw InvalidParameterValue("Day of month out of range");
+		throw out_of_range("DateTime::DateTime mday");
 }
 
 void DateTime::add_days(int days)
@@ -151,7 +150,7 @@ void DateTime::add_days(int days)
 
 	new_year += cycles;
 
-	if((year-fudge)%4+cycles>=4)
+	if((year-fudge)%4+cycles>=4 && (new_year%100>=4 || new_year%400<4))
 	{
 		// We passed a leap year - decrement days
 		if(days==0)
@@ -187,7 +186,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;
 }
 
@@ -239,7 +238,7 @@ int DateTime::cmp(const DateTime &dt) const
 TimeStamp DateTime::get_timestamp() const
 {
 	if(year<-289701 || year>293641)
-		throw InvalidState("DateTime is not representable as a TimeStamp");
+		throw range_error("DateTime::get_timestamp");
 
 	RawTime raw = (((hour*60LL)+minute)*60+second)*1000000+usec;
 	int days = (year-1970)*365;
@@ -255,8 +254,7 @@ TimeStamp DateTime::get_timestamp() const
 
 string DateTime::format(const string &fmt) const
 {
-	ostringstream ss;
-	ss.fill('0');
+	string result;
 	for(string::const_iterator i=fmt.begin(); i!=fmt.end(); ++i)
 	{
 		if(*i=='%')
@@ -265,31 +263,31 @@ string DateTime::format(const string &fmt) const
 			if(i==fmt.end())
 				break;
 			else if(*i=='d')
-				ss<<setw(2)<<int(mday);
+				result += Msp::format("%02d", mday);
 			else if(*i=='H')
-				ss<<setw(2)<<int(hour);
+				result += Msp::format("%02d", hour);
 			else if(*i=='I')
-				ss<<setw(2)<<hour%12;
+				result += Msp::format("%02d", hour%12);
 			else if(*i=='m')
-				ss<<setw(2)<<int(month);
+				result += Msp::format("%02d", month);
 			else if(*i=='M')
-				ss<<setw(2)<<int(minute);
+				result += Msp::format("%02d", minute);
 			else if(*i=='p')
-				ss<<((hour>=12) ? "PM" : "AM");
+				result += ((hour>=12) ? "PM" : "AM");
 			else if(*i=='S')
-				ss<<setw(2)<<int(second);
+				result += Msp::format("%02d", second);
 			else if(*i=='y')
-				ss<<setw(2)<<year%100;
+				result += Msp::format("%02d", year%100);
 			else if(*i=='Y')
-				ss<<setw(4)<<internal<<year;
+				result += Msp::format("%04d", year);
 			else if(*i=='%')
-				ss<<'%';
+				result += '%';
 		}
 		else
-			ss<<*i;
+			result += *i;
 	}
 
-	return ss.str();
+	return result;
 }
 
 string DateTime::format_rfc3339() const
@@ -297,11 +295,8 @@ string DateTime::format_rfc3339() const
 	string result = format("%Y-%m-%dT%H:%M:%S");
 	if(const TimeDelta &offs = zone.get_offset())
 	{
-		ostringstream ss;
-		ss.fill('0');
 		int m = abs(static_cast<int>(offs/Time::min));
-		ss<<(offs<zero ? '+' : '-')<<setw(2)<<m/60<<':'<<setw(2)<<m%60;
-		result += ss.str();
+		result += Msp::format("%c%02d:%02d", (offs<zero ? '-' : '+'), m/60, m%60);
 	}
 	else
 		result += 'Z';