-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
-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"
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)
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)
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;
}
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;
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=='%')
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
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';