X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ftime%2Fdatetime.cpp;h=e8170cc0246d26393b34d2d102d7005aa6d91e2e;hp=6617f862b0bdb705dd73fbb1f7b904a7e5761da1;hb=242a4a9abe1e1113b5eb39aa751aa054f696d7be;hpb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4 diff --git a/source/time/datetime.cpp b/source/time/datetime.cpp index 6617f86..e8170cc 100644 --- a/source/time/datetime.cpp +++ b/source/time/datetime.cpp @@ -1,17 +1,9 @@ -/* $Id$ - -This file is part of libmspcore -Copyright © 2006 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include -#include -#include -#include "../core/except.h" +#include +#include +#include #include "datetime.h" #include "timestamp.h" -#include "units.h" using namespace std; @@ -77,6 +69,82 @@ DateTime::DateTime(int y, unsigned char m, unsigned char d, unsigned char h, uns init(y, m, d, h, n, s, u); } +void DateTime::init(const TimeStamp &ts) +{ + year = 1970; + month = 1; + mday = 1; + hour = 0; + minute = 0; + second = 0; + usec = 0; + add_raw(ts.raw()); +} + +void DateTime::init(int y, unsigned char m, unsigned char d, unsigned char h, unsigned char n, unsigned char s, unsigned u) +{ + year = y; + month = m; + mday = d; + hour = h; + minute = n; + second = s; + usec = u; + + if(usec>=1000000) + throw out_of_range("DateTime::DateTime usec"); + if(second>=60) + throw out_of_range("DateTime::DateTime second"); + if(minute>=60) + throw out_of_range("DateTime::DateTime minute"); + if(hour>=24) + throw out_of_range("DateTime::DateTime hour"); + if(month<1 || month>12) + throw out_of_range("DateTime::DateTime month"); + if(mday<1 || mday>month_days(year, month)) + 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(m[1].str); + unsigned month = lexical_cast(m[2].str); + unsigned mday = lexical_cast(m[3].str); + unsigned hr = lexical_cast(m[4].str); + unsigned minute = lexical_cast(m[5].str); + unsigned second = lexical_cast(m[6].str); + unsigned us = 0; + const string &sec_frac = m[8].str; + if(!sec_frac.empty()) + { + us = lexical_cast(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(m[10].str)*60+lexical_cast(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; @@ -93,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; @@ -115,12 +183,12 @@ 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) { - days = is_leap_year(new_year-fudge)?365:364; + days = is_leap_year(new_year-fudge) ? 365 : 364; --new_year; } else @@ -151,7 +219,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; } @@ -203,7 +271,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; @@ -219,8 +287,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=='%') @@ -229,73 +296,48 @@ string DateTime::format(const string &fmt) const if(i==fmt.end()) break; else if(*i=='d') - ss<=12) ? "PM" : "AM"); + result += ((hour>=12) ? "PM" : "AM"); else if(*i=='S') - ss<(offs/Time::min)); - ss<<(offs(raw/86400000000LL); @@ -306,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(); @@ -337,21 +379,5 @@ void DateTime::normalize() } } -void DateTime::validate() const -{ - if(usec>=1000000) - throw InvalidParameterValue("Microseconds out of range"); - if(second>=60) - throw InvalidParameterValue("Seconds out of range"); - if(minute>=60) - throw InvalidParameterValue("Minutes out of range"); - if(hour>=24) - throw InvalidParameterValue("Hours out of range"); - if(month<1 || month>12) - throw InvalidParameterValue("Month out of range"); - if(mday<1 || mday>month_days(year, month)) - throw InvalidParameterValue("Day of month out of range"); -} - } // namespace Time } // namespace Msp