X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0f951faab071a72c06179224f0ab09ffc9e9b76..ca6a9a148646fb024d76b3e19c940ace56eec1f8:/src/common/datetime.cpp diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp index 74fcf22494..d3e20b66d5 100644 --- a/src/common/datetime.cpp +++ b/src/common/datetime.cpp @@ -13,9 +13,13 @@ // so long as the above copyright and this permission statement // are retained in all copies. // -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +// TODO: for $DEITY sake, someone please fix the #ifdef __WXWINCE__ everywhere, +// the proper way to do it is to implement (subset of) wxStrftime() for +// CE instead of this horror!! + /* * Implementation notes: * @@ -52,7 +56,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "datetime.h" #endif @@ -63,24 +67,56 @@ #pragma hdrstop #endif +#if !defined(wxUSE_DATETIME) || wxUSE_DATETIME + #ifndef WX_PRECOMP #include "wx/string.h" - #include "wx/intl.h" #include "wx/log.h" #endif // WX_PRECOMP +#include "wx/intl.h" #include "wx/thread.h" #include "wx/tokenzr.h" +#include "wx/module.h" -#define wxDEFINE_TIME_CONSTANTS // before including datetime.h +#include + +#ifdef __WINDOWS__ + #include "wx/msw/wrapwin.h" + #include + #ifndef __WXWINCE__ + #include + #endif +#endif #include "wx/datetime.h" +#include "wx/stopwatch.h" // for wxGetLocalTimeMillis() + +const long wxDateTime::TIME_T_FACTOR = 1000l; + +#if wxUSE_EXTENDED_RTTI + +template<> void wxStringReadValue(const wxString &s , wxDateTime &data ) +{ + data.ParseFormat(s,wxT("%Y-%m-%d %H:%M:%S")) ; +} + +template<> void wxStringWriteValue(wxString &s , const wxDateTime &data ) +{ + s = data.Format(wxT("%Y-%m-%d %H:%M:%S")) ; +} + +wxCUSTOM_TYPE_INFO(wxDateTime, wxToStringConverter , wxFromStringConverter) + +#endif +// // ---------------------------------------------------------------------------- // conditional compilation // ---------------------------------------------------------------------------- -#if defined(HAVE_STRPTIME) && defined(__LINUX__) +#if defined(HAVE_STRPTIME) && defined(__GLIBC__) && \ + ((__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)) // glibc 2.0.7 strptime() is broken - the following snippet causes it to // crash (instead of just failing): // @@ -91,13 +127,90 @@ #undef HAVE_STRPTIME #endif // broken strptime() -#ifndef WX_TIMEZONE - #ifdef __MINGW32__ +#if defined(HAVE_STRPTIME) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS + // configure detects strptime as linkable because it's in the OS X + // System library but MSL headers don't declare it. + +// char *strptime(const char *, const char *, struct tm *); + // However, we DON'T want to just provide it here because we would + // crash and/or overwrite data when strptime from OS X tries + // to fill in MW's struct tm which is two fields shorter (no TZ stuff) + // So for now let's just say we don't have strptime + #undef HAVE_STRPTIME +#endif + +#if defined(__MWERKS__) && wxUSE_UNICODE + #include +#endif + +#if !defined(WX_TIMEZONE) && !defined(WX_GMTOFF_IN_TM) + #if defined(__WXPALMOS__) + #define WX_GMTOFF_IN_TM + #elif defined(__BORLANDC__) || defined(__MINGW32__) || defined(__VISAGECPP__) #define WX_TIMEZONE _timezone + #elif defined(__MWERKS__) + long wxmw_timezone = 28800; + #define WX_TIMEZONE wxmw_timezone + #elif defined(__DJGPP__) || defined(__WINE__) + #include + #include + static long wxGetTimeZone() + { + static long timezone = MAXLONG; // invalid timezone + if (timezone == MAXLONG) + { + struct timeb tb; + ftime(&tb); + timezone = tb.timezone; + } + return timezone; + } + #define WX_TIMEZONE wxGetTimeZone() + #elif defined(__DARWIN__) + #define WX_GMTOFF_IN_TM #else // unknown platform - try timezone #define WX_TIMEZONE timezone #endif -#endif // !WX_TIMEZONE +#endif // !WX_TIMEZONE && !WX_GMTOFF_IN_TM + +// ---------------------------------------------------------------------------- +// macros +// ---------------------------------------------------------------------------- + +// debugging helper: just a convenient replacement of wxCHECK() +#define wxDATETIME_CHECK(expr, msg) \ + if ( !(expr) ) \ + { \ + wxFAIL_MSG(msg); \ + *this = wxInvalidDateTime; \ + return *this; \ + } + +// ---------------------------------------------------------------------------- +// private classes +// ---------------------------------------------------------------------------- + +class wxDateTimeHolidaysModule : public wxModule +{ +public: + virtual bool OnInit() + { + wxDateTimeHolidayAuthority::AddAuthority(new wxDateTimeWorkDays); + + return true; + } + + virtual void OnExit() + { + wxDateTimeHolidayAuthority::ClearAllAuthorities(); + wxDateTimeHolidayAuthority::ms_authorities.clear(); + } + +private: + DECLARE_DYNAMIC_CLASS(wxDateTimeHolidaysModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxDateTimeHolidaysModule, wxModule) // ---------------------------------------------------------------------------- // constants @@ -106,10 +219,16 @@ // some trivial ones static const int MONTHS_IN_YEAR = 12; -static const int SECONDS_IN_MINUTE = 60; +static const int SEC_PER_MIN = 60; + +static const int MIN_PER_HOUR = 60; + +static const int HOURS_PER_DAY = 24; static const long SECONDS_PER_DAY = 86400l; +static const int DAYS_PER_WEEK = 7; + static const long MILLISECONDS_PER_DAY = 86400000l; // this is the integral part of JDN of the midnight of Jan 1, 1970 @@ -137,19 +256,34 @@ static const wxDateTime::wxDateTime_t gs_cumulatedDays[2][MONTHS_IN_YEAR] = }; // ---------------------------------------------------------------------------- -// globals +// global data // ---------------------------------------------------------------------------- -// a critical section is needed to protect GetTimeZone() static -// variable in MT case -#if wxUSE_THREADS - wxCriticalSection gs_critsectTimezone; -#endif // wxUSE_THREADS +const wxChar * wxDefaultDateTimeFormat = wxT("%c"); +const wxChar * wxDefaultTimeSpanFormat = wxT("%H:%M:%S"); + +// in the fine tradition of ANSI C we use our equivalent of (time_t)-1 to +// indicate an invalid wxDateTime object +const wxDateTime wxDefaultDateTime; + +wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown; // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- +// debugger helper: shows what the date really is +#ifdef __WXDEBUG__ +extern const wxChar *wxDumpDate(const wxDateTime* dt) +{ + static wxChar buf[128]; + + wxStrcpy(buf, dt->Format(_T("%Y-%m-%d (%a) %H:%M:%S"))); + + return buf; +} +#endif // Debug + // get the number of days in the given month of the given year static inline wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month) @@ -165,25 +299,36 @@ wxDateTime::wxDateTime_t GetNumOfDaysInMonth(int year, wxDateTime::Month month) return daysInMonth[wxDateTime::IsLeapYear(year)][month]; } -// ensure that the timezone variable is set by calling localtime +// returns the time zone in the C sense, i.e. the difference UTC - local +// (in seconds) static int GetTimeZone() { - // set to TRUE when the timezone is set - static bool s_timezoneSet = FALSE; - - wxCRIT_SECT_LOCKER(lock, gs_critsectTimezone); +#ifdef WX_GMTOFF_IN_TM + // set to true when the timezone is set + static bool s_timezoneSet = false; + static long gmtoffset = LONG_MAX; // invalid timezone + // ensure that the timezone variable is set by calling localtime if ( !s_timezoneSet ) { // just call localtime() instead of figuring out whether this system // supports tzset(), _tzset() or something else - time_t t; - (void)localtime(&t); + time_t t = 0; + struct tm *tm; - s_timezoneSet = TRUE; + tm = localtime(&t); + s_timezoneSet = true; + + // note that GMT offset is the opposite of time zone and so to return + // consistent results in both WX_GMTOFF_IN_TM and !WX_GMTOFF_IN_TM + // cases we have to negate it + gmtoffset = -tm->tm_gmtoff; } + return (int)gmtoffset; +#else // !WX_GMTOFF_IN_TM return (int)WX_TIMEZONE; +#endif // WX_GMTOFF_IN_TM/!WX_GMTOFF_IN_TM } // return the integral part of the JDN for the midnight of the given date (to @@ -226,19 +371,61 @@ static long GetTruncatedJDN(wxDateTime::wxDateTime_t day, - JDN_OFFSET; } -// this function is a wrapper around strftime(3) +#ifndef __WXWINCE__ +// this function is a wrapper around strftime(3) adding error checking static wxString CallStrftime(const wxChar *format, const tm* tm) { wxChar buf[4096]; + // Create temp wxString here to work around mingw/cygwin bug 1046059 + // http://sourceforge.net/tracker/?func=detail&atid=102435&aid=1046059&group_id=2435 + wxString s; + if ( !wxStrftime(buf, WXSIZEOF(buf), format, tm) ) { // buffer is too small? wxFAIL_MSG(_T("strftime() failed")); } - return wxString(buf); + s = buf; + return s; +} +#endif + +#ifdef HAVE_STRPTIME + +// glibc2 doesn't define this in the headers unless _XOPEN_SOURCE is defined +// which, unfortunately, wreaks havoc elsewhere +#if defined(__GLIBC__) && (__GLIBC__ == 2) + extern "C" char *strptime(const char *, const char *, struct tm *); +#endif + +// Unicode-friendly strptime() wrapper +static const wxChar * +CallStrptime(const wxChar *input, const char *fmt, tm *tm) +{ + // the problem here is that strptime() returns pointer into the string we + // passed to it while we're really interested in the pointer into the + // original, Unicode, string so we try to transform the pointer back +#if wxUSE_UNICODE + wxCharBuffer inputMB(wxConvertWX2MB(input)); +#else // ASCII + const char * const inputMB = input; +#endif // Unicode/Ascii + + const char *result = strptime(inputMB, fmt, tm); + if ( !result ) + return NULL; + +#if wxUSE_UNICODE + // FIXME: this is wrong in presence of surrogates &c + return input + (result - inputMB.data()); +#else // ASCII + return result; +#endif // Unicode/Ascii } +#endif // HAVE_STRPTIME + // if year and/or month have invalid values, replace them with the current ones static void ReplaceDefaultYearMonthWithCurrent(int *year, wxDateTime::Month *month) @@ -336,16 +523,20 @@ static wxDateTime::WeekDay GetWeekDayFromName(const wxString& name, int flags) return wd; } -// scans all digits and returns the resulting number -static bool GetNumericToken(const wxChar*& p, unsigned long *number) +// scans all digits (but no more than len) and returns the resulting number +static bool GetNumericToken(size_t len, const wxChar*& p, unsigned long *number) { + size_t n = 1; wxString s; while ( wxIsdigit(*p) ) { s += *p++; + + if ( len && ++n > len ) + break; } - return !!s && s.ToULong(number); + return !s.empty() && s.ToULong(number); } // scans all alphabetic characters and returns the resulting string @@ -364,13 +555,6 @@ static wxString GetAlphaToken(const wxChar*& p) // implementation of wxDateTime // ============================================================================ -// ---------------------------------------------------------------------------- -// static data -// ---------------------------------------------------------------------------- - -wxDateTime::Country wxDateTime::ms_country = wxDateTime::Country_Unknown; -wxDateTime wxDateTime::ms_InvDateTime; - // ---------------------------------------------------------------------------- // struct Tm // ---------------------------------------------------------------------------- @@ -388,14 +572,14 @@ wxDateTime::Tm::Tm(const struct tm& tm, const TimeZone& tz) : m_tz(tz) { msec = 0; - sec = tm.tm_sec; - min = tm.tm_min; - hour = tm.tm_hour; - mday = tm.tm_mday; + sec = (wxDateTime::wxDateTime_t)tm.tm_sec; + min = (wxDateTime::wxDateTime_t)tm.tm_min; + hour = (wxDateTime::wxDateTime_t)tm.tm_hour; + mday = (wxDateTime::wxDateTime_t)tm.tm_mday; mon = (wxDateTime::Month)tm.tm_mon; year = 1900 + tm.tm_year; - wday = tm.tm_wday; - yday = tm.tm_yday; + wday = (wxDateTime::wxDateTime_t)tm.tm_wday; + yday = (wxDateTime::wxDateTime_t)tm.tm_yday; } bool wxDateTime::Tm::IsValid() const @@ -411,7 +595,7 @@ void wxDateTime::Tm::ComputeWeekDay() // compute the week day from day/month/year: we use the dumbest algorithm // possible: just compute our JDN and then use the (simple to derive) // formula: weekday = (JDN + 1.5) % 7 - wday = (wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7; + wday = (wxDateTime::wxDateTime_t)((wxDateTime::WeekDay)(GetTruncatedJDN(mday, mon, year) + 2) % 7); } void wxDateTime::Tm::AddMonths(int monDiff) @@ -424,7 +608,7 @@ void wxDateTime::Tm::AddMonths(int monDiff) monDiff += MONTHS_IN_YEAR; } - while ( monDiff + mon > MONTHS_IN_YEAR ) + while ( monDiff + mon >= MONTHS_IN_YEAR ) { year++; @@ -434,19 +618,22 @@ void wxDateTime::Tm::AddMonths(int monDiff) mon = (wxDateTime::Month)(mon + monDiff); wxASSERT_MSG( mon >= 0 && mon < MONTHS_IN_YEAR, _T("logic error") ); + + // NB: we don't check here that the resulting date is valid, this function + // is private and the caller must check it if needed } void wxDateTime::Tm::AddDays(int dayDiff) { // normalize the days field - mday += dayDiff; - while ( mday < 1 ) + while ( dayDiff + mday < 1 ) { AddMonths(-1); - mday += GetNumOfDaysInMonth(year, mon); + dayDiff += GetNumOfDaysInMonth(year, mon); } + mday = (wxDateTime::wxDateTime_t)( mday + dayDiff ); while ( mday > GetNumOfDaysInMonth(year, mon) ) { mday -= GetNumOfDaysInMonth(year, mon); @@ -505,7 +692,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz) case wxDateTime::A_CST: // Central Standard Time in use in Australia = UTC + 9.5 - m_offset = 60l*(9*60 + 30); + m_offset = 60l*(9*MIN_PER_HOUR + MIN_PER_HOUR/2); break; default: @@ -540,7 +727,7 @@ bool wxDateTime::IsLeapYear(int year, wxDateTime::Calendar cal) { wxFAIL_MSG(_T("unknown calendar")); - return FALSE; + return false; } } @@ -584,7 +771,6 @@ wxDateTime::Month wxDateTime::GetCurrentMonth(wxDateTime::Calendar cal) { case Gregorian: return Now().GetMonth(); - break; case Julian: wxFAIL_MSG(_T("TODO")); @@ -612,7 +798,6 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(int year, Calendar cal) case Gregorian: case Julian: return IsLeapYear(year) ? 366 : 365; - break; default: wxFAIL_MSG(_T("unsupported calendar")); @@ -651,8 +836,8 @@ wxDateTime::wxDateTime_t wxDateTime::GetNumberOfDays(wxDateTime::Month month, wxString wxDateTime::GetMonthName(wxDateTime::Month month, wxDateTime::NameFlags flags) { - wxCHECK_MSG( month != Inv_Month, _T(""), _T("invalid month") ); - + wxCHECK_MSG( month != Inv_Month, wxEmptyString, _T("invalid month") ); +#ifndef __WXWINCE__ // notice that we must set all the fields to avoid confusing libc (GNU one // gets confused to a crash if we don't do this) tm tm; @@ -660,18 +845,63 @@ wxString wxDateTime::GetMonthName(wxDateTime::Month month, tm.tm_mon = month; return CallStrftime(flags == Name_Abbr ? _T("%b") : _T("%B"), &tm); +#else + wxString ret; + switch(month) + { + case Jan: + ret = (flags == Name_Abbr ? wxT("Jan"): wxT("January")); + break; + case Feb: + ret = (flags == Name_Abbr ? wxT("Feb"): wxT("Febuary")); + break; + case Mar: + ret = (flags == Name_Abbr ? wxT("Mar"): wxT("March")); + break; + case Apr: + ret = (flags == Name_Abbr ? wxT("Apr"): wxT("April")); + break; + case May: + ret = (flags == Name_Abbr ? wxT("May"): wxT("May")); + break; + case Jun: + ret = (flags == Name_Abbr ? wxT("Jun"): wxT("June")); + break; + case Jul: + ret = (flags == Name_Abbr ? wxT("Jul"): wxT("July")); + break; + case Aug: + ret = (flags == Name_Abbr ? wxT("Aug"): wxT("August")); + break; + case Sep: + ret = (flags == Name_Abbr ? wxT("Sep"): wxT("September")); + break; + case Oct: + ret = (flags == Name_Abbr ? wxT("Oct"): wxT("October")); + break; + case Nov: + ret = (flags == Name_Abbr ? wxT("Nov"): wxT("November")); + break; + case Dec: + ret = (flags == Name_Abbr ? wxT("Dec"): wxT("December")); + break; + } + return ret; +#endif } /* static */ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, wxDateTime::NameFlags flags) { - wxCHECK_MSG( wday != Inv_WeekDay, _T(""), _T("invalid weekday") ); - - // take some arbitrary Sunday + wxCHECK_MSG( wday != Inv_WeekDay, wxEmptyString, _T("invalid weekday") ); +#ifndef __WXWINCE__ + // take some arbitrary Sunday (but notice that the day should be such that + // after adding wday to it below we still have a valid date, e.g. don't + // take 28 here!) tm tm; InitTm(tm); - tm.tm_mday = 28; + tm.tm_mday = 21; tm.tm_mon = Nov; tm.tm_year = 99; @@ -683,6 +913,35 @@ wxString wxDateTime::GetWeekDayName(wxDateTime::WeekDay wday, // ... and call strftime() return CallStrftime(flags == Name_Abbr ? _T("%a") : _T("%A"), &tm); +#else + wxString ret; + switch(wday) + { + case Sun: + ret = (flags == Name_Abbr ? wxT("Sun") : wxT("Sunday")); + break; + case Mon: + ret = (flags == Name_Abbr ? wxT("Mon") : wxT("Monday")); + break; + case Tue: + ret = (flags == Name_Abbr ? wxT("Tue") : wxT("Tuesday")); + break; + case Wed: + ret = (flags == Name_Abbr ? wxT("Wed") : wxT("Wednesday")); + break; + case Thu: + ret = (flags == Name_Abbr ? wxT("Thu") : wxT("Thursday")); + break; + case Fri: + ret = (flags == Name_Abbr ? wxT("Fri") : wxT("Friday")); + break; + case Sat: + ret = (flags == Name_Abbr ? wxT("Sat") : wxT("Saturday")); + break; + } + return ret; + +#endif } /* static */ @@ -690,14 +949,29 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm) { tm tm; InitTm(tm); + wxChar buffer[64]; + // @Note: Do not call 'CallStrftime' here! CallStrftime checks the return code + // and causes an assertion failed if the buffer is to small (which is good) - OR - + // if strftime does not return anything because the format string is invalid - OR - + // if there are no 'am' / 'pm' tokens defined for the current locale (which is not good). + // wxDateTime::ParseTime will try several different formats to parse the time. + // As a result, GetAmPmStrings might get called, even if the current locale + // does not define any 'am' / 'pm' tokens. In this case, wxStrftime would + // assert, even though it is a perfectly legal use. if ( am ) { - *am = CallStrftime(_T("%p"), &tm); + if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0) + *am = wxString(buffer); + else + *am = wxString(); } if ( pm ) { tm.tm_hour = 13; - *pm = CallStrftime(_T("%p"), &tm); + if (wxStrftime(buffer, sizeof(buffer)/sizeof(wxChar), _T("%p"), &tm) > 0) + *pm = wxString(buffer); + else + *pm = wxString(); } } @@ -710,7 +984,7 @@ void wxDateTime::GetAmPmStrings(wxString *am, wxString *pm) wxDateTime::Country wxDateTime::GetCountry() { // TODO use LOCALE_ICOUNTRY setting under Win32 - +#ifndef __WXWINCE__ if ( ms_country == Country_Unknown ) { // try to guess from the time zone name @@ -744,6 +1018,9 @@ wxDateTime::Country wxDateTime::GetCountry() ms_country = USA; } } +#else + ms_country = USA; +#endif return ms_country; } @@ -819,7 +1096,7 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country) if ( !IsDSTApplicable(year, country) ) { - return ms_InvDateTime; + return wxInvalidDateTime; } wxDateTime dt; @@ -835,7 +1112,8 @@ wxDateTime wxDateTime::GetBeginDST(int year, Country country) dt += wxTimeSpan::Hours(1); - dt.MakeGMT(); + // disable DST tests because it could result in an infinite recursion! + dt.MakeGMT(true); } else switch ( country ) { @@ -919,14 +1197,14 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country) if ( !IsDSTApplicable(year, country) ) { - return ms_InvDateTime; + return wxInvalidDateTime; } wxDateTime dt; if ( IsWestEuropeanCountry(country) || (country == Russia) ) { - // DST ends at 1 a.m. GMT on the last Sunday of October + // DST ends at 1 a.m. GMT on the last Sunday of October if ( !dt.SetToLastWeekDay(Sun, Oct, year) ) { // weirder and weirder... @@ -935,7 +1213,8 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country) dt += wxTimeSpan::Hours(1); - dt.MakeGMT(); + // disable DST tests because it could result in an infinite recursion! + dt.MakeGMT(true); } else switch ( country ) { @@ -957,7 +1236,7 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country) break; default: - // DST ends at 2 a.m. on the last Sunday of October + // DST ends at 2 a.m. on the last Sunday of October if ( !dt.SetToLastWeekDay(Sun, Oct, year) ) { // weirder and weirder... @@ -982,11 +1261,15 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country) // constructors and assignment operators // ---------------------------------------------------------------------------- +// return the current time with ms precision +/* static */ wxDateTime wxDateTime::UNow() +{ + return wxDateTime(wxGetLocalTimeMillis()); +} + // the values in the tm structure contain the local time wxDateTime& wxDateTime::Set(const struct tm& tm) { - wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") ); - struct tm tm2(tm); time_t timet = mktime(&tm2); @@ -996,21 +1279,18 @@ wxDateTime& wxDateTime::Set(const struct tm& tm) // less than timezone - try to make it work for this case if ( tm2.tm_year == 70 && tm2.tm_mon == 0 && tm2.tm_mday == 1 ) { - // add timezone to make sure that date is in range - tm2.tm_sec -= GetTimeZone(); - - timet = mktime(&tm2); - if ( timet != (time_t)-1 ) - { - timet += GetTimeZone(); - - return Set(timet); - } + return Set((time_t)( + GetTimeZone() + + tm2.tm_hour * MIN_PER_HOUR * SEC_PER_MIN + + tm2.tm_min * SEC_PER_MIN + + tm2.tm_sec)); } wxFAIL_MSG( _T("mktime() failed") ); - return ms_InvDateTime; + *this = wxInvalidDateTime; + + return *this; } else { @@ -1023,26 +1303,34 @@ wxDateTime& wxDateTime::Set(wxDateTime_t hour, wxDateTime_t second, wxDateTime_t millisec) { - wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") ); - // we allow seconds to be 61 to account for the leap seconds, even if we // don't use them really - wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000, - ms_InvDateTime, - _T("Invalid time in wxDateTime::Set()") ); + wxDATETIME_CHECK( hour < 24 && + second < 62 && + minute < 60 && + millisec < 1000, + _T("Invalid time in wxDateTime::Set()") ); // get the current date from system - time_t timet = GetTimeNow(); - struct tm *tm = localtime(&timet); + struct tm *tm = GetTmNow(); - wxCHECK_MSG( tm, ms_InvDateTime, _T("localtime() failed") ); + wxDATETIME_CHECK( tm, _T("localtime() failed") ); + + // make a copy so it isn't clobbered by the call to mktime() below + struct tm tm1(*tm); // adjust the time - tm->tm_hour = hour; - tm->tm_min = minute; - tm->tm_sec = second; + tm1.tm_hour = hour; + tm1.tm_min = minute; + tm1.tm_sec = second; + + // and the DST in case it changes on this date + struct tm tm2(tm1); + mktime(&tm2); + if ( tm2.tm_isdst != tm1.tm_isdst ) + tm1.tm_isdst = tm2.tm_isdst; - (void)Set(*tm); + (void)Set(tm1); // and finally adjust milliseconds return SetMillisecond(millisec); @@ -1056,17 +1344,16 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day, wxDateTime_t second, wxDateTime_t millisec) { - wxASSERT_MSG( IsValid(), _T("invalid wxDateTime") ); - - wxCHECK_MSG( hour < 24 && second < 62 && minute < 60 && millisec < 1000, - ms_InvDateTime, - _T("Invalid time in wxDateTime::Set()") ); + wxDATETIME_CHECK( hour < 24 && + second < 62 && + minute < 60 && + millisec < 1000, + _T("Invalid time in wxDateTime::Set()") ); ReplaceDefaultYearMonthWithCurrent(&year, &month); - wxCHECK_MSG( (0 < day) && (day <= GetNumberOfDays(month, year)), - ms_InvDateTime, - _T("Invalid date in wxDateTime::Set()") ); + wxDATETIME_CHECK( (0 < day) && (day <= GetNumberOfDays(month, year)), + _T("Invalid date in wxDateTime::Set()") ); // the range of time_t type (inclusive) static const int yearMinInRange = 1970; @@ -1090,7 +1377,10 @@ wxDateTime& wxDateTime::Set(wxDateTime_t day, (void)Set(tm); // and finally adjust milliseconds - return SetMillisecond(millisec); + if (IsValid()) + SetMillisecond(millisec); + + return *this; } else { @@ -1115,13 +1405,107 @@ wxDateTime& wxDateTime::Set(double jdn) // EPOCH_JDN + 0.5 jdn -= EPOCH_JDN + 0.5; - jdn *= MILLISECONDS_PER_DAY; + m_time.Assign(jdn*MILLISECONDS_PER_DAY); + + // JDNs always are in UTC, so we don't need any adjustments for time zone + + return *this; +} + +wxDateTime& wxDateTime::ResetTime() +{ + Tm tm = GetTm(); + + if ( tm.hour || tm.min || tm.sec || tm.msec ) + { + tm.msec = + tm.sec = + tm.min = + tm.hour = 0; - m_time = jdn; + Set(tm); + } return *this; } +// ---------------------------------------------------------------------------- +// DOS Date and Time Format functions +// ---------------------------------------------------------------------------- +// the dos date and time value is an unsigned 32 bit value in the format: +// YYYYYYYMMMMDDDDDhhhhhmmmmmmsssss +// +// Y = year offset from 1980 (0-127) +// M = month (1-12) +// D = day of month (1-31) +// h = hour (0-23) +// m = minute (0-59) +// s = bisecond (0-29) each bisecond indicates two seconds +// ---------------------------------------------------------------------------- + +wxDateTime& wxDateTime::SetFromDOS(unsigned long ddt) +{ + struct tm tm; + InitTm(tm); + + long year = ddt & 0xFE000000; + year >>= 25; + year += 80; + tm.tm_year = year; + + long month = ddt & 0x1E00000; + month >>= 21; + month -= 1; + tm.tm_mon = month; + + long day = ddt & 0x1F0000; + day >>= 16; + tm.tm_mday = day; + + long hour = ddt & 0xF800; + hour >>= 11; + tm.tm_hour = hour; + + long minute = ddt & 0x7E0; + minute >>= 5; + tm.tm_min = minute; + + long second = ddt & 0x1F; + tm.tm_sec = second * 2; + + return Set(mktime(&tm)); +} + +unsigned long wxDateTime::GetAsDOS() const +{ + unsigned long ddt; + time_t ticks = GetTicks(); + struct tm *tm = localtime(&ticks); + + long year = tm->tm_year; + year -= 80; + year <<= 25; + + long month = tm->tm_mon; + month += 1; + month <<= 21; + + long day = tm->tm_mday; + day <<= 16; + + long hour = tm->tm_hour; + hour <<= 11; + + long minute = tm->tm_min; + minute <<= 5; + + long second = tm->tm_sec; + second /= 2; + + ddt = year | month | day | hour | minute | second; + return ddt; +} + // ---------------------------------------------------------------------------- // time_t <-> broken down time conversions // ---------------------------------------------------------------------------- @@ -1141,12 +1525,17 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const tm = localtime(&time); // should never happen - wxCHECK_MSG( tm, Tm(), _T("gmtime() failed") ); + wxCHECK_MSG( tm, Tm(), _T("localtime() failed") ); } else { - time += tz.GetOffset(); + time += (time_t)tz.GetOffset(); +#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning + int time2 = (int) time; + if ( time2 >= 0 ) +#else if ( time >= 0 ) +#endif { tm = gmtime(&time); @@ -1161,7 +1550,11 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const if ( tm ) { - return Tm(*tm, tz); + // adjust the milliseconds + Tm tm2(*tm, tz); + long timeOnly = (m_time % MILLISECONDS_PER_DAY).ToLong(); + tm2.msec = (wxDateTime_t)(timeOnly % 1000); + return tm2; } //else: use generic code below } @@ -1193,18 +1586,18 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const wxASSERT_MSG( jdn > -2, _T("JDN out of range") ); // calculate the century - int temp = (jdn + JDN_OFFSET) * 4 - 1; - int century = temp / DAYS_PER_400_YEARS; + long temp = (jdn + JDN_OFFSET) * 4 - 1; + long century = temp / DAYS_PER_400_YEARS; // then the year and day of year (1 <= dayOfYear <= 366) temp = ((temp % DAYS_PER_400_YEARS) / 4) * 4 + 3; - int year = (century * 100) + (temp / DAYS_PER_4_YEARS); - int dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1; + long year = (century * 100) + (temp / DAYS_PER_4_YEARS); + long dayOfYear = (temp % DAYS_PER_4_YEARS) / 4 + 1; // and finally the month and day of the month temp = dayOfYear * 5 - 3; - int month = temp / DAYS_PER_5_MONTHS; - int day = (temp % DAYS_PER_5_MONTHS) / 5 + 1; + long month = temp / DAYS_PER_5_MONTHS; + long day = (temp % DAYS_PER_5_MONTHS) / 5 + 1; // month is counted from March - convert to normal if ( month < 10 ) @@ -1223,26 +1616,24 @@ wxDateTime::Tm wxDateTime::GetTm(const TimeZone& tz) const // check that the algorithm gave us something reasonable wxASSERT_MSG( (0 < month) && (month <= 12), _T("invalid month") ); wxASSERT_MSG( (1 <= day) && (day < 32), _T("invalid day") ); - wxASSERT_MSG( (INT_MIN <= year) && (year <= INT_MAX), - _T("year range overflow") ); // construct Tm from these values Tm tm; tm.year = (int)year; tm.mon = (Month)(month - 1); // algorithm yields 1 for January, not 0 tm.mday = (wxDateTime_t)day; - tm.msec = timeOnly % 1000; + tm.msec = (wxDateTime_t)(timeOnly % 1000); timeOnly -= tm.msec; timeOnly /= 1000; // now we have time in seconds - tm.sec = timeOnly % 60; + tm.sec = (wxDateTime_t)(timeOnly % SEC_PER_MIN); timeOnly -= tm.sec; - timeOnly /= 60; // now we have time in minutes + timeOnly /= SEC_PER_MIN; // now we have time in minutes - tm.min = timeOnly % 60; + tm.min = (wxDateTime_t)(timeOnly % MIN_PER_HOUR); timeOnly -= tm.min; - tm.hour = timeOnly / 60; + tm.hour = (wxDateTime_t)(timeOnly / MIN_PER_HOUR); return tm; } @@ -1334,10 +1725,27 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff) tm.year += diff.GetYears(); tm.AddMonths(diff.GetMonths()); + + // check that the resulting date is valid + if ( tm.mday > GetNumOfDaysInMonth(tm.year, tm.mon) ) + { + // We suppose that when adding one month to Jan 31 we want to get Feb + // 28 (or 29), i.e. adding a month to the last day of the month should + // give the last day of the next month which is quite logical. + // + // Unfortunately, there is no logic way to understand what should + // Jan 30 + 1 month be - Feb 28 too or Feb 27 (assuming non leap year)? + // We make it Feb 28 (last day too), but it is highly questionable. + tm.mday = GetNumOfDaysInMonth(tm.year, tm.mon); + } + tm.AddDays(diff.GetTotalDays()); Set(tm); + wxASSERT_MSG( IsSameTime(tm), + _T("Add(wxDateSpan) shouldn't modify time") ); + return *this; } @@ -1345,38 +1753,120 @@ wxDateTime& wxDateTime::Add(const wxDateSpan& diff) // Weekday and monthday stuff // ---------------------------------------------------------------------------- +// convert Sun, Mon, ..., Sat into 6, 0, ..., 5 +static inline int ConvertWeekDayToMondayBase(int wd) +{ + return wd == wxDateTime::Sun ? 6 : wd - 1; +} + +/* static */ +wxDateTime +wxDateTime::SetToWeekOfYear(int year, wxDateTime_t numWeek, WeekDay wd) +{ + wxASSERT_MSG( numWeek > 0, + _T("invalid week number: weeks are counted from 1") ); + + // Jan 4 always lies in the 1st week of the year + wxDateTime dt(4, Jan, year); + dt.SetToWeekDayInSameWeek(wd); + dt += wxDateSpan::Weeks(numWeek - 1); + + return dt; +} + +// use a separate function to avoid warnings about using deprecated +// SetToTheWeek in GetWeek below +static wxDateTime +SetToTheWeek(int year, + wxDateTime::wxDateTime_t numWeek, + wxDateTime::WeekDay weekday, + wxDateTime::WeekFlags flags) +{ + // Jan 4 always lies in the 1st week of the year + wxDateTime dt(4, wxDateTime::Jan, year); + dt.SetToWeekDayInSameWeek(weekday, flags); + dt += wxDateSpan::Weeks(numWeek - 1); + + return dt; +} + +bool wxDateTime::SetToTheWeek(wxDateTime_t numWeek, + WeekDay weekday, + WeekFlags flags) +{ + int year = GetYear(); + *this = ::SetToTheWeek(year, numWeek, weekday, flags); + if ( GetYear() != year ) + { + // oops... numWeek was too big + return false; + } + + return true; +} + +wxDateTime wxDateTime::GetWeek(wxDateTime_t numWeek, + WeekDay weekday, + WeekFlags flags) const +{ + return ::SetToTheWeek(GetYear(), numWeek, weekday, flags); +} + wxDateTime& wxDateTime::SetToLastMonthDay(Month month, int year) { // take the current month/year if none specified - ReplaceDefaultYearMonthWithCurrent(&year, &month); + if ( year == Inv_Year ) + year = GetYear(); + if ( month == Inv_Month ) + month = GetMonth(); return Set(GetNumOfDaysInMonth(year, month), month, year); } -wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday) +wxDateTime& wxDateTime::SetToWeekDayInSameWeek(WeekDay weekday, WeekFlags flags) { - wxCHECK_MSG( weekday != Inv_WeekDay, ms_InvDateTime, _T("invalid weekday") ); + wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") ); - WeekDay wdayThis = GetWeekDay(); - if ( weekday == wdayThis ) + int wdayDst = weekday, + wdayThis = GetWeekDay(); + if ( wdayDst == wdayThis ) { // nothing to do return *this; } - else if ( weekday < wdayThis ) + + if ( flags == Default_First ) + { + flags = GetCountry() == USA ? Sunday_First : Monday_First; + } + + // the logic below based on comparing weekday and wdayThis works if Sun (0) + // is the first day in the week, but breaks down for Monday_First case so + // we adjust the week days in this case + if ( flags == Monday_First ) { - return Substract(wxTimeSpan::Days(wdayThis - weekday)); + if ( wdayThis == Sun ) + wdayThis += 7; + if ( wdayDst == Sun ) + wdayDst += 7; + } + //else: Sunday_First, nothing to do + + // go forward or back in time to the day we want + if ( wdayDst < wdayThis ) + { + return Subtract(wxDateSpan::Days(wdayThis - wdayDst)); } else // weekday > wdayThis { - return Add(wxTimeSpan::Days(weekday - wdayThis)); + return Add(wxDateSpan::Days(wdayDst - wdayThis)); } } wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday) { - wxCHECK_MSG( weekday != Inv_WeekDay, ms_InvDateTime, _T("invalid weekday") ); + wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") ); int diff; WeekDay wdayThis = GetWeekDay(); @@ -1395,12 +1885,12 @@ wxDateTime& wxDateTime::SetToNextWeekDay(WeekDay weekday) diff = weekday - wdayThis; } - return Add(wxTimeSpan::Days(diff)); + return Add(wxDateSpan::Days(diff)); } wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday) { - wxCHECK_MSG( weekday != Inv_WeekDay, ms_InvDateTime, _T("invalid weekday") ); + wxDATETIME_CHECK( weekday != Inv_WeekDay, _T("invalid weekday") ); int diff; WeekDay wdayThis = GetWeekDay(); @@ -1419,7 +1909,7 @@ wxDateTime& wxDateTime::SetToPrevWeekDay(WeekDay weekday) diff = wdayThis - weekday; } - return Substract(wxTimeSpan::Days(diff)); + return Subtract(wxDateSpan::Days(diff)); } bool wxDateTime::SetToWeekDay(WeekDay weekday, @@ -1427,9 +1917,9 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday, Month month, int year) { - wxCHECK_MSG( weekday != Inv_WeekDay, FALSE, _T("invalid weekday") ); + wxCHECK_MSG( weekday != Inv_WeekDay, false, _T("invalid weekday") ); - // we don't check explicitly that -5 <= n <= 5 because we will return FALSE + // we don't check explicitly that -5 <= n <= 5 because we will return false // anyhow in such case - but may be should still give an assert for it? // take the current month/year if none specified @@ -1481,72 +1971,110 @@ bool wxDateTime::SetToWeekDay(WeekDay weekday, { *this = dt; - return TRUE; + return true; } else { // no such day in this month - return FALSE; + return false; } } -wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const +static inline +wxDateTime::wxDateTime_t GetDayOfYearFromTm(const wxDateTime::Tm& tm) { - Tm tm(GetTm(tz)); - - return gs_cumulatedDays[IsLeapYear(tm.year)][tm.mon] + tm.mday; + return (wxDateTime::wxDateTime_t)(gs_cumulatedDays[wxDateTime::IsLeapYear(tm.year)][tm.mon] + tm.mday); } -wxDateTime::wxDateTime_t wxDateTime::GetWeekOfYear(const TimeZone& tz) const +wxDateTime::wxDateTime_t wxDateTime::GetDayOfYear(const TimeZone& tz) const { -#if 0 - // the first week of the year is the one which contains Jan, 4 (according - // to ISO standard rule), so the year day N0 = 4 + 7*W always lies in the - // week W+1. As any day N = 7*W + 4 + (N - 4)%7, it lies in the same week - // as N0 or in the next one. - - // TODO this surely may be optimized - I got confused while writing it - - wxDateTime_t nDayInYear = GetDayOfYear(tz); + return GetDayOfYearFromTm(GetTm(tz)); +} - // the week day of the day lying in the first week - WeekDay wdayStart = wxDateTime(4, Jan, GetYear()).GetWeekDay(); +wxDateTime::wxDateTime_t +wxDateTime::GetWeekOfYear(wxDateTime::WeekFlags flags, const TimeZone& tz) const +{ + if ( flags == Default_First ) + { + flags = GetCountry() == USA ? Sunday_First : Monday_First; + } - wxDateTime_t week = (nDayInYear - 4) / 7 + 1; + Tm tm(GetTm(tz)); + wxDateTime_t nDayInYear = GetDayOfYearFromTm(tm); - // notice that Sunday shoould be counted as 7, not 0 here! - if ( ((nDayInYear - 4) % 7) + (!wdayStart ? 7 : wdayStart) > 7 ) + int wdTarget = GetWeekDay(tz); + int wdYearStart = wxDateTime(1, Jan, GetYear()).GetWeekDay(); + int week; + if ( flags == Sunday_First ) + { + // FIXME: First week is not calculated correctly. + week = (nDayInYear - wdTarget + 7) / 7; + if ( wdYearStart == Wed || wdYearStart == Thu ) + week++; + } + else // week starts with monday { - week++; + // adjust the weekdays to non-US style. + wdYearStart = ConvertWeekDayToMondayBase(wdYearStart); + wdTarget = ConvertWeekDayToMondayBase(wdTarget); + + // quoting from http://www.cl.cam.ac.uk/~mgk25/iso-time.html: + // + // Week 01 of a year is per definition the first week that has the + // Thursday in this year, which is equivalent to the week that + // contains the fourth day of January. In other words, the first + // week of a new year is the week that has the majority of its + // days in the new year. Week 01 might also contain days from the + // previous year and the week before week 01 of a year is the last + // week (52 or 53) of the previous year even if it contains days + // from the new year. A week starts with Monday (day 1) and ends + // with Sunday (day 7). + // + + // if Jan 1 is Thursday or less, it is in the first week of this year + if ( wdYearStart < 4 ) + { + // count the number of entire weeks between Jan 1 and this date + week = (nDayInYear + wdYearStart + 6 - wdTarget)/7; + + // be careful to check for overflow in the next year + if ( week == 53 && tm.mday - wdTarget > 28 ) + week = 1; + } + else // Jan 1 is in the last week of the previous year + { + // check if we happen to be at the last week of previous year: + if ( tm.mon == Jan && tm.mday < 8 - wdYearStart ) + week = wxDateTime(31, Dec, GetYear()-1).GetWeekOfYear(); + else + week = (nDayInYear + wdYearStart - 1 - wdTarget)/7; + } } - return week; -#else // this seems to be a bit simpler and I believe is also correct - return (WeekDay)((GetDayOfYear() - (GetWeekDay() - 1 + 7) % 7 + 7) / 7); -#endif // 0/1 + return (wxDateTime::wxDateTime_t)week; } -wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(const TimeZone& tz) const +wxDateTime::wxDateTime_t wxDateTime::GetWeekOfMonth(wxDateTime::WeekFlags flags, + const TimeZone& tz) const { - size_t nWeek = 0; - - wxDateTime dt(*this); - do + Tm tm = GetTm(tz); + wxDateTime dtMonthStart = wxDateTime(1, tm.mon, tm.year); + int nWeek = GetWeekOfYear(flags) - dtMonthStart.GetWeekOfYear(flags) + 1; + if ( nWeek < 0 ) { - nWeek++; - - dt -= wxTimeSpan::Week(); + // this may happen for January when Jan, 1 is the last week of the + // previous year + nWeek += IsLeapYear(tm.year - 1) ? 53 : 52; } - while ( dt.GetMonth(tz) == GetMonth(tz) ); - return nWeek; + return (wxDateTime::wxDateTime_t)nWeek; } wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday) { int year = GetYear(); - wxCHECK_MSG( (0 < yday) && (yday < GetNumberOfDays(year)), - ms_InvDateTime, _T("invalid year day") ); + wxDATETIME_CHECK( (0 < yday) && (yday <= GetNumberOfDays(year)), + _T("invalid year day") ); bool isLeap = IsLeapYear(year); for ( Month mon = Jan; mon < Inv_Month; wxNextMonth(mon) ) @@ -1554,9 +2082,9 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday) // for Dec, we can't compare with gs_cumulatedDays[mon + 1], but we // don't need it neither - because of the CHECK above we know that // yday lies in December then - if ( (mon == Dec) || (yday < gs_cumulatedDays[isLeap][mon + 1]) ) + if ( (mon == Dec) || (yday <= gs_cumulatedDays[isLeap][mon + 1]) ) { - Set(yday - gs_cumulatedDays[isLeap][mon], mon, year); + Set((wxDateTime::wxDateTime_t)(yday - gs_cumulatedDays[isLeap][mon]), mon, year); break; } @@ -1571,16 +2099,7 @@ wxDateTime& wxDateTime::SetToYearDay(wxDateTime::wxDateTime_t yday) double wxDateTime::GetJulianDayNumber() const { - // JDN are always expressed for the GMT dates - Tm tm(ToTimezone(GMT0).GetTm(GMT0)); - - double result = GetTruncatedJDN(tm.mday, tm.mon, tm.year); - - // add the part GetTruncatedJDN() neglected - result += 0.5; - - // and now add the time: 86400 sec = 1 JDN - return result + ((double)(60*(60*tm.hour + tm.min) + tm.sec)) / 86400; + return m_time.ToDouble() / MILLISECONDS_PER_DAY + EPOCH_JDN + 0.5; } double wxDateTime::GetRataDie() const @@ -1622,18 +2141,34 @@ int wxDateTime::IsDST(wxDateTime::Country country) const } } -wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz) +wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST) +{ + long secDiff = GetTimeZone() + tz.GetOffset(); + + // we need to know whether DST is or not in effect for this date unless + // the test disabled by the caller + if ( !noDST && (IsDST() == 1) ) + { + // FIXME we assume that the DST is always shifted by 1 hour + secDiff -= 3600; + } + + return Add(wxTimeSpan::Seconds(secDiff)); +} + +wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST) { - int secDiff = GetTimeZone() + tz.GetOffset(); + long secDiff = GetTimeZone() + tz.GetOffset(); - // we need to know whether DST is or not in effect for this date - if ( IsDST() == 1 ) + // we need to know whether DST is or not in effect for this date unless + // the test disabled by the caller + if ( !noDST && (IsDST() == 1) ) { // FIXME we assume that the DST is always shifted by 1 hour secDiff -= 3600; } - return Substract(wxTimeSpan::Seconds(secDiff)); + return Subtract(wxTimeSpan::Seconds(secDiff)); } // ---------------------------------------------------------------------------- @@ -1642,10 +2177,12 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz) wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const { - wxCHECK_MSG( format, _T(""), _T("NULL format in wxDateTime::Format") ); + wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxDateTime::Format") ); + // we have to use our own implementation if the date is out of range of + // strftime() or if we use non standard specificators time_t time = GetTicks(); - if ( time != (time_t)-1 ) + if ( (time != (time_t)-1) && !wxStrstr(format, _T("%l")) ) { // use strftime() tm *tm; @@ -1659,9 +2196,14 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const } else { - time += tz.GetOffset(); + time += (int)tz.GetOffset(); +#if defined(__VMS__) || defined(__WATCOMC__) // time is unsigned so avoid warning + int time2 = (int) time; + if ( time2 >= 0 ) +#else if ( time >= 0 ) +#endif { tm = gmtime(&time); @@ -1673,16 +2215,19 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const tm = (struct tm *)NULL; } } - +#ifndef __WXWINCE__ + //Windows CE doesn't support strftime or wcsftime, so we use the generic implementation if ( tm ) { return CallStrftime(format, tm); } +#endif //else: use generic code below } // we only parse ANSI C format specifications here, no POSIX 2 - // complications, no GNU extensions + // complications, no GNU extensions but we do add support for a "%l" format + // specifier allowing to get the number of milliseconds Tm tm = GetTm(tz); // used for calls to strftime() when we only deal with time @@ -1716,9 +2261,14 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const break; case _T('j'): // day of year has 3 digits + case _T('l'): // milliseconds have 3 digits fmt = _T("%03d"); break; + case _T('w'): // week day as number has only one + fmt = _T("%d"); + break; + default: // it's either another valid format specifier in which case // the format is "%02d" (for all the rest) or we have the @@ -1727,260 +2277,284 @@ wxString wxDateTime::Format(const wxChar *format, const TimeZone& tz) const fmt = _T("%02d"); } -restart: - // start of the format specification - switch ( *p ) + bool restart = true; + while ( restart ) { - case _T('a'): // a weekday name - case _T('A'): - // second parameter should be TRUE for abbreviated names - res += GetWeekDayName(tm.GetWeekDay(), - *p == _T('a') ? Name_Abbr : Name_Full); - break; + restart = false; - case _T('b'): // a month name - case _T('B'): - res += GetMonthName(tm.mon, - *p == _T('b') ? Name_Abbr : Name_Full); - break; + // start of the format specification + switch ( *p ) + { + case _T('a'): // a weekday name + case _T('A'): + // second parameter should be true for abbreviated names + res += GetWeekDayName(tm.GetWeekDay(), + *p == _T('a') ? Name_Abbr : Name_Full); + break; - case _T('c'): // locale default date and time representation - case _T('x'): // locale default date representation - // - // the problem: there is no way to know what do these format - // specifications correspond to for the current locale. - // - // the solution: use a hack and still use strftime(): first - // find the YEAR which is a year in the strftime() range (1970 - // - 2038) whose Jan 1 falls on the same week day as the Jan 1 - // of the real year. Then make a copy of the format and - // replace all occurences of YEAR in it with some unique - // string not appearing anywhere else in it, then use - // strftime() to format the date in year YEAR and then replace - // YEAR back by the real year and the unique replacement - // string back with YEAR. Notice that "all occurences of YEAR" - // means all occurences of 4 digit as well as 2 digit form! - // - // the bugs: we assume that neither of %c nor %x contains any - // fields which may change between the YEAR and real year. For - // example, the week number (%U, %W) and the day number (%j) - // will change if one of these years is leap and the other one - // is not! - { - // find the YEAR: normally, for any year X, Jan 1 or the - // year X + 28 is the same weekday as Jan 1 of X (because - // the weekday advances by 1 for each normal X and by 2 - // for each leap X, hence by 5 every 4 years or by 35 - // which is 0 mod 7 every 28 years) but this rule breaks - // down if there are years between X and Y which are - // divisible by 4 but not leap (i.e. divisible by 100 but - // not 400), hence the correction. - - int yearReal = GetYear(tz); - int mod28 = yearReal % 28; - - // be careful to not go too far - we risk to leave the - // supported range - int year; - if ( mod28 < 10 ) - { - year = 1988 + mod28; // 1988 == 0 (mod 28) - } - else + case _T('b'): // a month name + case _T('B'): + res += GetMonthName(tm.mon, + *p == _T('b') ? Name_Abbr : Name_Full); + break; + + case _T('c'): // locale default date and time representation + case _T('x'): // locale default date representation +#ifndef __WXWINCE__ + // + // the problem: there is no way to know what do these format + // specifications correspond to for the current locale. + // + // the solution: use a hack and still use strftime(): first + // find the YEAR which is a year in the strftime() range (1970 + // - 2038) whose Jan 1 falls on the same week day as the Jan 1 + // of the real year. Then make a copy of the format and + // replace all occurrences of YEAR in it with some unique + // string not appearing anywhere else in it, then use + // strftime() to format the date in year YEAR and then replace + // YEAR back by the real year and the unique replacement + // string back with YEAR. Notice that "all occurrences of YEAR" + // means all occurrences of 4 digit as well as 2 digit form! + // + // the bugs: we assume that neither of %c nor %x contains any + // fields which may change between the YEAR and real year. For + // example, the week number (%U, %W) and the day number (%j) + // will change if one of these years is leap and the other one + // is not! { - year = 1970 + mod28 - 10; // 1970 == 10 (mod 28) - } + // find the YEAR: normally, for any year X, Jan 1 or the + // year X + 28 is the same weekday as Jan 1 of X (because + // the weekday advances by 1 for each normal X and by 2 + // for each leap X, hence by 5 every 4 years or by 35 + // which is 0 mod 7 every 28 years) but this rule breaks + // down if there are years between X and Y which are + // divisible by 4 but not leap (i.e. divisible by 100 but + // not 400), hence the correction. + + int yearReal = GetYear(tz); + int mod28 = yearReal % 28; + + // be careful to not go too far - we risk to leave the + // supported range + int year; + if ( mod28 < 10 ) + { + year = 1988 + mod28; // 1988 == 0 (mod 28) + } + else + { + year = 1970 + mod28 - 10; // 1970 == 10 (mod 28) + } - int nCentury = year / 100, - nCenturyReal = yearReal / 100; + int nCentury = year / 100, + nCenturyReal = yearReal / 100; - // need to adjust for the years divisble by 400 which are - // not leap but are counted like leap ones if we just take - // the number of centuries in between for nLostWeekDays - int nLostWeekDays = (nCentury - nCenturyReal) - - (nCentury / 4 - nCenturyReal / 4); + // need to adjust for the years divisble by 400 which are + // not leap but are counted like leap ones if we just take + // the number of centuries in between for nLostWeekDays + int nLostWeekDays = (nCentury - nCenturyReal) - + (nCentury / 4 - nCenturyReal / 4); - // we have to gain back the "lost" weekdays: note that the - // effect of this loop is to not do anything to - // nLostWeekDays (which we won't use any more), but to - // (indirectly) set the year correctly - while ( (nLostWeekDays % 7) != 0 ) - { - nLostWeekDays += year++ % 4 ? 1 : 2; - } + // we have to gain back the "lost" weekdays: note that the + // effect of this loop is to not do anything to + // nLostWeekDays (which we won't use any more), but to + // (indirectly) set the year correctly + while ( (nLostWeekDays % 7) != 0 ) + { + nLostWeekDays += year++ % 4 ? 1 : 2; + } - // at any rate, we couldn't go further than 1988 + 9 + 28! - wxASSERT_MSG( year < 2030, - _T("logic error in wxDateTime::Format") ); + // at any rate, we couldn't go further than 1988 + 9 + 28! + wxASSERT_MSG( year < 2030, + _T("logic error in wxDateTime::Format") ); - wxString strYear, strYear2; - strYear.Printf(_T("%d"), year); - strYear2.Printf(_T("%d"), year % 100); + wxString strYear, strYear2; + strYear.Printf(_T("%d"), year); + strYear2.Printf(_T("%d"), year % 100); - // find two strings not occuring in format (this is surely - // not optimal way of doing it... improvements welcome!) - wxString fmt = format; - wxString replacement = (wxChar)-1; - while ( fmt.Find(replacement) != wxNOT_FOUND ) - { - replacement << (wxChar)-1; - } + // find two strings not occurring in format (this is surely + // not the optimal way of doing it... improvements welcome!) + wxString fmt = format; + wxString replacement = (wxChar)-1; + while ( fmt.Find(replacement) != wxNOT_FOUND ) + { + replacement << (wxChar)-1; + } - wxString replacement2 = (wxChar)-2; - while ( fmt.Find(replacement) != wxNOT_FOUND ) - { - replacement << (wxChar)-2; - } + wxString replacement2 = (wxChar)-2; + while ( fmt.Find(replacement) != wxNOT_FOUND ) + { + replacement << (wxChar)-2; + } - // replace all occurences of year with it - bool wasReplaced = fmt.Replace(strYear, replacement) > 0; - if ( !wasReplaced ) - wasReplaced = fmt.Replace(strYear2, replacement2) > 0; + // replace all occurrences of year with it + bool wasReplaced = fmt.Replace(strYear, replacement) > 0; + if ( !wasReplaced ) + wasReplaced = fmt.Replace(strYear2, replacement2) > 0; + + // use strftime() to format the same date but in supported + // year + // + // NB: we assume that strftime() doesn't check for the + // date validity and will happily format the date + // corresponding to Feb 29 of a non leap year (which + // may happen if yearReal was leap and year is not) + struct tm tmAdjusted; + InitTm(tmAdjusted); + tmAdjusted.tm_hour = tm.hour; + tmAdjusted.tm_min = tm.min; + tmAdjusted.tm_sec = tm.sec; + tmAdjusted.tm_wday = tm.GetWeekDay(); + tmAdjusted.tm_yday = GetDayOfYear(); + tmAdjusted.tm_mday = tm.mday; + tmAdjusted.tm_mon = tm.mon; + tmAdjusted.tm_year = year - 1900; + tmAdjusted.tm_isdst = 0; // no DST, already adjusted + wxString str = CallStrftime(*p == _T('c') ? _T("%c") + : _T("%x"), + &tmAdjusted); + + // now replace the occurrence of 1999 with the real year + wxString strYearReal, strYearReal2; + strYearReal.Printf(_T("%04d"), yearReal); + strYearReal2.Printf(_T("%02d"), yearReal % 100); + str.Replace(strYear, strYearReal); + str.Replace(strYear2, strYearReal2); + + // and replace back all occurrences of replacement string + if ( wasReplaced ) + { + str.Replace(replacement2, strYear2); + str.Replace(replacement, strYear); + } - // use strftime() to format the same date but in supported - // year - // - // NB: we assume that strftime() doesn't check for the - // date validity and will happily format the date - // corresponding to Feb 29 of a non leap year (which - // may happen if yearReal was leap and year is not) - struct tm tmAdjusted; - InitTm(tmAdjusted); - tmAdjusted.tm_hour = tm.hour; - tmAdjusted.tm_min = tm.min; - tmAdjusted.tm_sec = tm.sec; - tmAdjusted.tm_wday = tm.GetWeekDay(); - tmAdjusted.tm_yday = GetDayOfYear(); - tmAdjusted.tm_mday = tm.mday; - tmAdjusted.tm_mon = tm.mon; - tmAdjusted.tm_year = year - 1900; - tmAdjusted.tm_isdst = 0; // no DST, already adjusted - wxString str = CallStrftime(*p == _T('c') ? _T("%c") - : _T("%x"), - &tmAdjusted); - - // now replace the occurence of 1999 with the real year - wxString strYearReal, strYearReal2; - strYearReal.Printf(_T("%04d"), yearReal); - strYearReal2.Printf(_T("%02d"), yearReal % 100); - str.Replace(strYear, strYearReal); - str.Replace(strYear2, strYearReal2); - - // and replace back all occurences of replacement string - if ( wasReplaced ) - { - str.Replace(replacement2, strYear2); - str.Replace(replacement, strYear); + res += str; } +#else + //Use "%m/%d/%y %H:%M:%S" format instead + res += wxString::Format(wxT("%02d/%02d/%04d %02d:%02d:%02d"), + tm.mon+1,tm.mday, tm.year, tm.hour, tm.min, tm.sec); +#endif + break; - res += str; - } - break; + case _T('d'): // day of a month (01-31) + res += wxString::Format(fmt, tm.mday); + break; - case _T('d'): // day of a month (01-31) - res += wxString::Format(fmt, tm.mday); - break; + case _T('H'): // hour in 24h format (00-23) + res += wxString::Format(fmt, tm.hour); + break; - case _T('H'): // hour in 24h format (00-23) - res += wxString::Format(fmt, tm.hour); - break; + case _T('I'): // hour in 12h format (01-12) + { + // 24h -> 12h, 0h -> 12h too + int hour12 = tm.hour > 12 ? tm.hour - 12 + : tm.hour ? tm.hour : 12; + res += wxString::Format(fmt, hour12); + } + break; - case _T('I'): // hour in 12h format (01-12) - { - // 24h -> 12h, 0h -> 12h too - int hour12 = tm.hour > 12 ? tm.hour - 12 - : tm.hour ? tm.hour : 12; - res += wxString::Format(fmt, hour12); - } - break; + case _T('j'): // day of the year + res += wxString::Format(fmt, GetDayOfYear(tz)); + break; - case _T('j'): // day of the year - res += wxString::Format(fmt, GetDayOfYear(tz)); - break; + case _T('l'): // milliseconds (NOT STANDARD) + res += wxString::Format(fmt, GetMillisecond(tz)); + break; - case _T('m'): // month as a number (01-12) - res += wxString::Format(fmt, tm.mon + 1); - break; + case _T('m'): // month as a number (01-12) + res += wxString::Format(fmt, tm.mon + 1); + break; - case _T('M'): // minute as a decimal number (00-59) - res += wxString::Format(fmt, tm.min); - break; + case _T('M'): // minute as a decimal number (00-59) + res += wxString::Format(fmt, tm.min); + break; - case _T('p'): // AM or PM string - res += CallStrftime(_T("%p"), &tmTimeOnly); - break; + case _T('p'): // AM or PM string +#ifndef __WXWINCE__ + res += CallStrftime(_T("%p"), &tmTimeOnly); +#else + res += (tmTimeOnly.tm_hour > 12) ? wxT("pm") : wxT("am"); +#endif + break; - case _T('S'): // second as a decimal number (00-61) - res += wxString::Format(fmt, tm.sec); - break; + case _T('S'): // second as a decimal number (00-61) + res += wxString::Format(fmt, tm.sec); + break; - case _T('U'): // week number in the year (Sunday 1st week day) - { - int week = (GetDayOfYear(tz) - tm.GetWeekDay() + 7) / 7; - res += wxString::Format(fmt, week); - } - break; + case _T('U'): // week number in the year (Sunday 1st week day) + res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz)); + break; - case _T('W'): // week number in the year (Monday 1st week day) - res += wxString::Format(fmt, GetWeekOfYear(tz)); - break; + case _T('W'): // week number in the year (Monday 1st week day) + res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz)); + break; - case _T('w'): // weekday as a number (0-6), Sunday = 0 - res += wxString::Format(fmt, tm.GetWeekDay()); - break; + case _T('w'): // weekday as a number (0-6), Sunday = 0 + res += wxString::Format(fmt, tm.GetWeekDay()); + break; - // case _T('x'): -- handled with "%c" + // case _T('x'): -- handled with "%c" - case _T('X'): // locale default time representation - // just use strftime() to format the time for us - res += CallStrftime(_T("%X"), &tmTimeOnly); - break; + case _T('X'): // locale default time representation + // just use strftime() to format the time for us +#ifndef __WXWINCE__ + res += CallStrftime(_T("%X"), &tmTimeOnly); +#else + res += wxString::Format(wxT("%02d:%02d:%02d"),tm.hour, tm.min, tm.sec); +#endif + break; - case _T('y'): // year without century (00-99) - res += wxString::Format(fmt, tm.year % 100); - break; + case _T('y'): // year without century (00-99) + res += wxString::Format(fmt, tm.year % 100); + break; - case _T('Y'): // year with century - res += wxString::Format(fmt, tm.year); - break; + case _T('Y'): // year with century + res += wxString::Format(fmt, tm.year); + break; - case _T('Z'): // timezone name - res += CallStrftime(_T("%Z"), &tmTimeOnly); - break; + case _T('Z'): // timezone name +#ifndef __WXWINCE__ + res += CallStrftime(_T("%Z"), &tmTimeOnly); +#endif + break; - default: - // is it the format width? - fmt.Empty(); - while ( *p == _T('-') || *p == _T('+') || - *p == _T(' ') || wxIsdigit(*p) ) - { - fmt += *p; - } + default: + // is it the format width? + fmt.Empty(); + while ( *p == _T('-') || *p == _T('+') || + *p == _T(' ') || wxIsdigit(*p) ) + { + fmt += *p; + } - if ( !fmt.IsEmpty() ) - { - // we've only got the flags and width so far in fmt - fmt.Prepend(_T('%')); - fmt.Append(_T('d')); + if ( !fmt.empty() ) + { + // we've only got the flags and width so far in fmt + fmt.Prepend(_T('%')); + fmt.Append(_T('d')); - goto restart; - } + restart = true; + + break; + } - // no, it wasn't the width - wxFAIL_MSG(_T("unknown format specificator")); + // no, it wasn't the width + wxFAIL_MSG(_T("unknown format specificator")); - // fall through and just copy it nevertheless + // fall through and just copy it nevertheless - case _T('%'): // a percent sign - res += *p; - break; + case _T('%'): // a percent sign + res += *p; + break; - case 0: // the end of string - wxFAIL_MSG(_T("missing format at the end of string")); + case 0: // the end of string + wxFAIL_MSG(_T("missing format at the end of string")); - // just put the '%' which was the last char in format - res += _T('%'); - break; + // just put the '%' which was the last char in format + res += _T('%'); + break; + } } } @@ -2027,11 +2601,11 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - wxDateTime_t day = *p++ - _T('0'); + wxDateTime_t day = (wxDateTime_t)(*p++ - _T('0')); if ( wxIsdigit(*p) ) { day *= 10; - day += *p++ - _T('0'); + day = (wxDateTime_t)(day + (*p++ - _T('0'))); } if ( *p++ != _T(' ') ) @@ -2125,7 +2699,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - wxDateTime_t hour = *p++ - _T('0'); + wxDateTime_t hour = (wxDateTime_t)(*p++ - _T('0')); if ( !wxIsdigit(*p) ) { @@ -2133,7 +2707,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } hour *= 10; - hour += *p++ - _T('0'); + hour = (wxDateTime_t)(hour + (*p++ - _T('0'))); if ( *p++ != _T(':') ) { @@ -2145,7 +2719,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - wxDateTime_t min = *p++ - _T('0'); + wxDateTime_t min = (wxDateTime_t)(*p++ - _T('0')); if ( !wxIsdigit(*p) ) { @@ -2153,7 +2727,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } min *= 10; - min += *p++ - _T('0'); + min = (wxDateTime_t)(min + *p++ - _T('0')); wxDateTime_t sec = 0; if ( *p++ == _T(':') ) @@ -2163,7 +2737,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) return (wxChar *)NULL; } - sec = *p++ - _T('0'); + sec = (wxDateTime_t)(*p++ - _T('0')); if ( !wxIsdigit(*p) ) { @@ -2171,7 +2745,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } sec *= 10; - sec += *p++ - _T('0'); + sec = (wxDateTime_t)(sec + *p++ - _T('0')); } if ( *p++ != _T(' ') ) @@ -2180,7 +2754,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } // and now the interesting part: the timezone - int offset; + int offset wxDUMMY_INITIALIZE(0); if ( *p == _T('-') || *p == _T('+') ) { // the explicit offset given: it has the form of hhmm @@ -2192,7 +2766,7 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) } // hours - offset = 60*(10*(*p - _T('0')) + (*(p + 1) - _T('0'))); + offset = MIN_PER_HOUR*(10*(*p - _T('0')) + (*(p + 1) - _T('0'))); p += 2; @@ -2270,18 +2844,178 @@ const wxChar *wxDateTime::ParseRfc822Date(const wxChar* date) p += tz.length(); } - + // make it minutes - offset *= 60; + offset *= MIN_PER_HOUR; } - // the spec was correct + // the spec was correct, construct the date from the values we found Set(day, mon, year, hour, min, sec); - MakeTimezone(60*offset); + MakeFromTimezone(TimeZone((wxDateTime_t)(offset*SEC_PER_MIN))); return p; } +#ifdef __WINDOWS__ + +// returns the string containing strftime() format used for short dates in the +// current locale or an empty string +static wxString GetLocaleDateFormat() +{ + wxString fmtWX; + + // there is no setlocale() under Windows CE, so just always query the + // system there +#ifndef __WXWINCE__ + if ( strcmp(setlocale(LC_ALL, NULL), "C") != 0 ) +#endif + { + // The locale was programatically set to non-C. We assume that this was + // done using wxLocale, in which case thread's current locale is also + // set to correct LCID value and we can use GetLocaleInfo to determine + // the correct formatting string: +#ifdef __WXWINCE__ + LCID lcid = LOCALE_USER_DEFAULT; +#else + LCID lcid = GetThreadLocale(); +#endif + // according to MSDN 80 chars is max allowed for short date format + wxChar fmt[81]; + if ( ::GetLocaleInfo(lcid, LOCALE_SSHORTDATE, fmt, WXSIZEOF(fmt)) ) + { + wxChar chLast = _T('\0'); + size_t lastCount = 0; + for ( const wxChar *p = fmt; /* NUL handled inside */; p++ ) + { + if ( *p == chLast ) + { + lastCount++; + continue; + } + + switch ( *p ) + { + // these characters come in groups, start counting them + case _T('d'): + case _T('M'): + case _T('y'): + case _T('g'): + chLast = *p; + lastCount = 1; + break; + + default: + // first deal with any special characters we have had + if ( lastCount ) + { + switch ( chLast ) + { + case _T('d'): + switch ( lastCount ) + { + case 1: // d + case 2: // dd + // these two are the same as we + // don't distinguish between 1 and + // 2 digits for days + fmtWX += _T("%d"); + break; + + case 3: // ddd + fmtWX += _T("%a"); + break; + + case 4: // dddd + fmtWX += _T("%A"); + break; + + default: + wxFAIL_MSG( _T("too many 'd's") ); + } + break; + + case _T('M'): + switch ( lastCount ) + { + case 1: // M + case 2: // MM + // as for 'd' and 'dd' above + fmtWX += _T("%m"); + break; + + case 3: + fmtWX += _T("%b"); + break; + + case 4: + fmtWX += _T("%B"); + break; + + default: + wxFAIL_MSG( _T("too many 'M's") ); + } + break; + + case _T('y'): + switch ( lastCount ) + { + case 1: // y + case 2: // yy + fmtWX += _T("%y"); + break; + + case 4: // yyyy + fmtWX += _T("%Y"); + break; + + default: + wxFAIL_MSG( _T("wrong number of 'y's") ); + } + break; + + case _T('g'): + // strftime() doesn't have era string, + // ignore this format + wxASSERT_MSG( lastCount <= 2, + _T("too many 'g's") ); + break; + + default: + wxFAIL_MSG( _T("unreachable") ); + } + + chLast = _T('\0'); + lastCount = 0; + } + + // not a special character so must be just a separator, + // treat as is + if ( *p != _T('\0') ) + { + if ( *p == _T('%') ) + { + // this one needs to be escaped + fmtWX += _T('%'); + } + + fmtWX += *p; + } + } + + if ( *p == _T('\0') ) + break; + } + } + //else: GetLocaleInfo() failed, leave fmtDate value unchanged and + // try our luck with the default formats + } + //else: default C locale, default formats should work + + return fmtWX; +} + +#endif // __WINDOWS__ + const wxChar *wxDateTime::ParseFormat(const wxChar *date, const wxChar *format, const wxDateTime& dateDef) @@ -2293,17 +3027,17 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, unsigned long num; // what fields have we found? - bool haveWDay = FALSE, - haveYDay = FALSE, - haveDay = FALSE, - haveMon = FALSE, - haveYear = FALSE, - haveHour = FALSE, - haveMin = FALSE, - haveSec = FALSE; - - bool hourIsIn12hFormat = FALSE, // or in 24h one? - isPM = FALSE; // AM by default + bool haveWDay = false, + haveYDay = false, + haveDay = false, + haveMon = false, + haveYear = false, + haveHour = false, + haveMin = false, + haveSec = false; + + bool hourIsIn12hFormat = false, // or in 24h one? + isPM = false; // AM by default // and the value of the items we have (init them to get rid of warnings) wxDateTime_t sec = 0, @@ -2345,7 +3079,41 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, } // start of a format specification - switch ( *++fmt ) + + // parse the optional width + size_t width = 0; + while ( wxIsdigit(*++fmt) ) + { + width *= 10; + width += *fmt - _T('0'); + } + + // the default widths for the various fields + if ( !width ) + { + switch ( *fmt ) + { + case _T('Y'): // year has 4 digits + width = 4; + break; + + case _T('j'): // day of year has 3 digits + case _T('l'): // milliseconds have 3 digits + width = 3; + break; + + case _T('w'): // week day as number has only one + width = 1; + break; + + default: + // default for all other fields + width = 2; + } + } + + // then the format itself + switch ( *fmt ) { case _T('a'): // a weekday name case _T('A'): @@ -2358,7 +3126,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } } - haveWDay = TRUE; + haveWDay = true; break; case _T('b'): // a month name @@ -2372,7 +3140,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } } - haveMon = TRUE; + haveMon = true; break; case _T('c'): // locale default date and time representation @@ -2381,7 +3149,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, // this is the format which corresponds to ctime() output // and strptime("%c") should parse it, so try it first - static const wxChar *fmtCtime = _T("%a %b %e %H:%M:%S %Y"); + static const wxChar *fmtCtime = _T("%a %b %d %H:%M:%S %Y"); const wxChar *result = dt.ParseFormat(input, fmtCtime); if ( !result ) @@ -2400,12 +3168,26 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } + Tm tm = dt.GetTm(); + + haveDay = haveMon = haveYear = + haveHour = haveMin = haveSec = true; + + hour = tm.hour; + min = tm.min; + sec = tm.sec; + + year = tm.year; + mon = tm.mon; + mday = tm.mday; + input = result; } break; case _T('d'): // day of a month (01-31) - if ( !GetNumericToken(input, &num) || (num > 31) ) + if ( !GetNumericToken(width, input, &num) || + (num > 31) || (num < 1) ) { // no match return (wxChar *)NULL; @@ -2413,63 +3195,63 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, // we can't check whether the day range is correct yet, will // do it later - assume ok for now - haveDay = TRUE; + haveDay = true; mday = (wxDateTime_t)num; break; - + case _T('H'): // hour in 24h format (00-23) - if ( !GetNumericToken(input, &num) || (num > 23) ) + if ( !GetNumericToken(width, input, &num) || (num > 23) ) { // no match return (wxChar *)NULL; } - haveHour = TRUE; + haveHour = true; hour = (wxDateTime_t)num; break; case _T('I'): // hour in 12h format (01-12) - if ( !GetNumericToken(input, &num) || !num || (num > 12) ) + if ( !GetNumericToken(width, input, &num) || !num || (num > 12) ) { // no match return (wxChar *)NULL; } - haveHour = TRUE; - hourIsIn12hFormat = TRUE; - hour = num % 12; // 12 should be 0 + haveHour = true; + hourIsIn12hFormat = true; + hour = (wxDateTime_t)(num % 12); // 12 should be 0 break; case _T('j'): // day of the year - if ( !GetNumericToken(input, &num) || !num || (num > 366) ) + if ( !GetNumericToken(width, input, &num) || !num || (num > 366) ) { // no match return (wxChar *)NULL; } - haveYDay = TRUE; + haveYDay = true; yday = (wxDateTime_t)num; break; case _T('m'): // month as a number (01-12) - if ( !GetNumericToken(input, &num) || !num || (num > 12) ) + if ( !GetNumericToken(width, input, &num) || !num || (num > 12) ) { // no match return (wxChar *)NULL; } - haveMon = TRUE; - mon = (Month)num; + haveMon = true; + mon = (Month)(num - 1); break; case _T('M'): // minute as a decimal number (00-59) - if ( !GetNumericToken(input, &num) || (num > 59) ) + if ( !GetNumericToken(width, input, &num) || (num > 59) ) { // no match return (wxChar *)NULL; } - haveMin = TRUE; + haveMin = true; min = (wxDateTime_t)num; break; @@ -2478,9 +3260,11 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, wxString am, pm, token = GetAlphaToken(input); GetAmPmStrings(&am, &pm); + if (am.empty() && pm.empty()) + return (wxChar *)NULL; // no am/pm strings defined if ( token.CmpNoCase(pm) == 0 ) { - isPM = TRUE; + isPM = true; } else if ( token.CmpNoCase(am) != 0 ) { @@ -2500,7 +3284,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } - haveHour = haveMin = haveSec = TRUE; + haveHour = haveMin = haveSec = true; Tm tm = dt.GetTm(); hour = tm.hour; @@ -2519,21 +3303,22 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } - haveHour = haveMin = TRUE; + haveHour = haveMin = true; Tm tm = dt.GetTm(); hour = tm.hour; min = tm.min; } + break; case _T('S'): // second as a decimal number (00-61) - if ( !GetNumericToken(input, &num) || (num > 61) ) + if ( !GetNumericToken(width, input, &num) || (num > 61) ) { // no match return (wxChar *)NULL; } - haveSec = TRUE; + haveSec = true; sec = (wxDateTime_t)num; break; @@ -2547,38 +3332,40 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } - haveHour = haveMin = haveSec = TRUE; + haveHour = haveMin = haveSec = true; Tm tm = dt.GetTm(); hour = tm.hour; min = tm.min; sec = tm.sec; } + break; case _T('w'): // weekday as a number (0-6), Sunday = 0 - if ( !GetNumericToken(input, &num) || (wday > 6) ) + if ( !GetNumericToken(width, input, &num) || (wday > 6) ) { // no match return (wxChar *)NULL; } - haveWDay = TRUE; + haveWDay = true; wday = (WeekDay)num; break; case _T('x'): // locale default date representation #ifdef HAVE_STRPTIME - // try using strptime() - it may fail even if the input is + // try using strptime() -- it may fail even if the input is // correct but the date is out of range, so we will fall back - // to our generic code anyhow (FIXME !Unicode friendly) + // to our generic code anyhow { struct tm tm; - const wxChar *result = strptime(input, "%x", &tm); + + const wxChar *result = CallStrptime(input, "%x", &tm); if ( result ) { input = result; - haveDay = haveMon = haveYear = TRUE; + haveDay = haveMon = haveYear = true; year = 1900 + tm.tm_year; mon = (Month)tm.tm_mon; @@ -2589,22 +3376,39 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, } #endif // HAVE_STRPTIME - // TODO query the LOCALE_IDATE setting under Win32 { wxDateTime dt; - - wxString fmtDate; - if ( IsWestEuropeanCountry(GetCountry()) || - GetCountry() == Russia ) + wxString fmtDate, + fmtDateAlt; + +#ifdef __WINDOWS__ + // The above doesn't work for all locales, try to query + // Windows for the right way of formatting the date: + fmtDate = GetLocaleDateFormat(); + if ( fmtDate.empty() ) +#endif { - fmtDate = _T("%d/%m/%y"); + if ( IsWestEuropeanCountry(GetCountry()) || + GetCountry() == Russia ) + { + fmtDate = _T("%d/%m/%y"); + fmtDateAlt = _T("%m/%d/%y"); + } + else // assume USA + { + fmtDate = _T("%m/%d/%y"); + fmtDateAlt = _T("%d/%m/%y"); + } } - else // assume USA + + const wxChar *result = dt.ParseFormat(input, fmtDate); + + if ( !result && !fmtDateAlt.empty() ) { - fmtDate = _T("%m/%d/%y"); + // ok, be nice and try another one + result = dt.ParseFormat(input, fmtDateAlt); } - const wxChar *result = dt.ParseFormat(input, fmtDate); if ( !result ) { // bad luck @@ -2613,7 +3417,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, Tm tm = dt.GetTm(); - haveDay = haveMon = haveYear = TRUE; + haveDay = haveMon = haveYear = true; year = tm.year; mon = tm.mon; @@ -2629,13 +3433,13 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, { // use strptime() to do it for us (FIXME !Unicode friendly) struct tm tm; - input = strptime(input, "%X", &tm); + input = CallStrptime(input, "%X", &tm); if ( !input ) { return (wxChar *)NULL; } - haveHour = haveMin = haveSec = TRUE; + haveHour = haveMin = haveSec = true; hour = tm.tm_hour; min = tm.tm_min; @@ -2663,7 +3467,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, return (wxChar *)NULL; } - haveHour = haveMin = haveSec = TRUE; + haveHour = haveMin = haveSec = true; Tm tm = dt.GetTm(); hour = tm.hour; @@ -2676,25 +3480,28 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, break; case _T('y'): // year without century (00-99) - if ( !GetNumericToken(input, &num) || (num > 99) ) + if ( !GetNumericToken(width, input, &num) || (num > 99) ) { // no match return (wxChar *)NULL; } - haveYear = TRUE; - year = 1900 + num; + haveYear = true; + + // TODO should have an option for roll over date instead of + // hard coding it here + year = (num > 30 ? 1900 : 2000) + (wxDateTime_t)num; break; case _T('Y'): // year with century - if ( !GetNumericToken(input, &num) || !num || (num > 366) ) + if ( !GetNumericToken(width, input, &num) ) { // no match return (wxChar *)NULL; } - haveYDay = TRUE; - yday = (wxDateTime_t)num; + haveYear = true; + year = (wxDateTime_t)num; break; case _T('Z'): // timezone name @@ -2750,11 +3557,25 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, // also always ignore the week day if ( haveMon && haveDay ) { + if ( mday > GetNumOfDaysInMonth(tm.year, mon) ) + { + wxLogDebug(_T("bad month day in wxDateTime::ParseFormat")); + + return (wxChar *)NULL; + } + tm.mon = mon; tm.mday = mday; } else if ( haveYDay ) { + if ( yday > GetNumberOfDays(tm.year) ) + { + wxLogDebug(_T("bad year day in wxDateTime::ParseFormat")); + + return (wxChar *)NULL; + } + Tm tm2 = wxDateTime(1, Jan, tm.year).SetToYearDay(yday).GetTm(); tm.mon = tm2.mon; @@ -2772,7 +3593,7 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, // set the time if ( haveHour ) { - tm.hour = hour; + tm.hour = hour; } if ( haveMin ) @@ -2787,6 +3608,14 @@ const wxChar *wxDateTime::ParseFormat(const wxChar *date, Set(tm); + // finally check that the week day is consistent -- if we had it + if ( haveWDay && GetWeekDay() != wday ) + { + wxLogDebug(_T("inconsistsnet week day in wxDateTime::ParseFormat()")); + + return NULL; + } + return input; } @@ -2794,11 +3623,48 @@ const wxChar *wxDateTime::ParseDateTime(const wxChar *date) { wxCHECK_MSG( date, (wxChar *)NULL, _T("NULL pointer in wxDateTime::Parse") ); - // there is a public domain version of getdate.y, but it only works for - // English... - wxFAIL_MSG(_T("TODO")); + // Set to current day and hour, so strings like '14:00' becomes today at + // 14, not some other random date + wxDateTime dtDate = wxDateTime::Today(); + wxDateTime dtTime = wxDateTime::Today(); + + const wxChar* pchTime; + + // Try to parse the beginning of the string as a date + const wxChar* pchDate = dtDate.ParseDate(date); + + // We got a date in the beginning, see if there is a time specified after the date + if ( pchDate ) + { + // Skip spaces, as the ParseTime() function fails on spaces + while ( wxIsspace(*pchDate) ) + pchDate++; + + pchTime = dtTime.ParseTime(pchDate); + } + else // no date in the beginning + { + // check and see if we have a time followed by a date + pchTime = dtTime.ParseTime(date); + if ( pchTime ) + { + while ( wxIsspace(*pchTime) ) + pchTime++; + + pchDate = dtDate.ParseDate(pchTime); + } + } - return (wxChar *)NULL; + // If we have a date specified, set our own data to the same date + if ( !pchDate || !pchTime ) + return NULL; + + Set(dtDate.GetDay(), dtDate.GetMonth(), dtDate.GetYear(), + dtTime.GetHour(), dtTime.GetMinute(), dtTime.GetSecond(), + dtTime.GetMillisecond()); + + // Return endpoint of scan + return pchDate > pchTime ? pchDate : pchTime; } const wxChar *wxDateTime::ParseDate(const wxChar *date) @@ -2813,23 +3679,52 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) while ( wxIsspace(*p) ) p++; - wxString today = _T("today"); - size_t len = today.length(); - if ( wxString(p, len).CmpNoCase(today) == 0 ) + // some special cases + static struct + { + const wxChar *str; + int dayDiffFromToday; + } literalDates[] = + { + { wxTRANSLATE("today"), 0 }, + { wxTRANSLATE("yesterday"), -1 }, + { wxTRANSLATE("tomorrow"), 1 }, + }; + + for ( size_t n = 0; n < WXSIZEOF(literalDates); n++ ) { - // nothing can follow this, so stop here - p += len; + wxString date = wxGetTranslation(literalDates[n].str); + size_t len = date.length(); + if ( wxStrlen(p) >= len ) + { + wxString str(p, len); + if ( str.CmpNoCase(date) == 0 ) + { + // nothing can follow this, so stop here + p += len; - *this = Today(); + int dayDiffFromToday = literalDates[n].dayDiffFromToday; + *this = Today(); + if ( dayDiffFromToday ) + { + *this += wxDateSpan::Days(dayDiffFromToday); + } - return p; + return p; + } + } } + // We try to guess what we have here: for each new (numeric) token, we + // determine if it can be a month, day or a year. Of course, there is an + // ambiguity as some numbers may be days as well as months, so we also + // have the ability to back track. + // what do we have? - bool haveDay = FALSE, // the months day? - haveWDay = FALSE, // the day of week? - haveMon = FALSE, // the month? - haveYear = FALSE; // the year? + bool haveDay = false, // the months day? + haveWDay = false, // the day of week? + haveMon = false, // the month? + haveYear = false; // the year? // and the value of the items we have (init them to get rid of warnings) WeekDay wday = Inv_WeekDay; @@ -2838,10 +3733,14 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) int year = 0; // tokenize the string - wxStringTokenizer tok(p, _T(",/-\t ")); + size_t nPosCur = 0; + static const wxChar *dateDelimiters = _T(".,/-\t\r\n "); + wxStringTokenizer tok(p, dateDelimiters); while ( tok.HasMoreTokens() ) { wxString token = tok.GetNextToken(); + if ( !token ) + continue; // is it a number? unsigned long val; @@ -2849,127 +3748,98 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) { // guess what this number is - bool isDay = FALSE, - isMonth = FALSE, - // only years are counted from 0 - isYear = (val == 0) || (val > 31); - if ( !isYear ) + bool isDay = false, + isMonth = false, + isYear = false; + + if ( !haveMon && val > 0 && val <= 12 ) + { + // assume it is month + isMonth = true; + } + else // not the month { - // may be the month or month day or the year, assume the - // month day by default and fallback to month if the range - // allow it or to the year if our assumption doesn't work if ( haveDay ) { - // we already have the day, so may only be a month or year - if ( val > 12 ) - { - isYear = TRUE; - } - else - { - isMonth = TRUE; - } + // this can only be the year + isYear = true; } - else // it may be day + else // may be either day or year { - isDay = TRUE; - - // check the range - if ( haveMon ) + wxDateTime_t max_days = (wxDateTime_t)( + haveMon + ? GetNumOfDaysInMonth(haveYear ? year : Inv_Year, mon) + : 31 + ); + + // can it be day? + if ( (val == 0) || (val > (unsigned long)max_days) ) { - if ( val > GetNumOfDaysInMonth(haveYear ? year - : Inv_Year, - mon) ) - { - // oops, it can't be a day finally - isDay = FALSE; - - if ( val > 12 ) - { - isYear = TRUE; - } - else - { - isMonth = TRUE; - } - } + // no + isYear = true; + } + else // yes, suppose it's the day + { + isDay = true; } } } - // remember that we have this and stop the scan if it's the second - // time we find this, except for the day logic (see there) if ( isYear ) { if ( haveYear ) - { break; - } - haveYear = TRUE; + haveYear = true; - // no roll over - 99 means 99, not 1999 for us - year = val; + year = (wxDateTime_t)val; } - else if ( isMonth ) + else if ( isDay ) { - if ( haveMon ) - { + if ( haveDay ) break; - } - haveMon = TRUE; + haveDay = true; - mon = (wxDateTime::Month)val; + day = (wxDateTime_t)val; } - else + else if ( isMonth ) { - wxASSERT_MSG( isDay, _T("logic error") ); - - if ( haveDay ) - { - // may be were mistaken when we found it for the first - // time? may be it was a month or year instead? - // - // this ability to "backtrack" allows us to correctly parse - // both things like 01/13 and 13/01 - but, of course, we - // still can't resolve the ambiguity in 01/02 (it will be - // Feb 1 for us, not Jan 2 as americans might expect!) - if ( (day <= 12) && !haveMon ) - { - // exchange day and month - mon = (wxDateTime::Month)day; - - haveMon = TRUE; - } - else if ( !haveYear ) - { - // exchange day and year - year = day; - - haveYear = TRUE; - } - } - - haveDay = TRUE; + haveMon = true; - day = val; + mon = (Month)(val - 1); } } else // not a number { - mon = GetMonthFromName(token, Name_Full | Name_Abbr); - if ( mon != Inv_Month ) + // be careful not to overwrite the current mon value + Month mon2 = GetMonthFromName(token, Name_Full | Name_Abbr); + if ( mon2 != Inv_Month ) { // it's a month if ( haveMon ) { - break; + // but we already have a month - maybe we guessed wrong? + if ( !haveDay ) + { + // no need to check in month range as always < 12, but + // the days are counted from 1 unlike the months + day = (wxDateTime_t)(mon + 1); + haveDay = true; + } + else + { + // could possible be the year (doesn't the year come + // before the month in the japanese format?) (FIXME) + break; + } } - haveMon = TRUE; + mon = mon2; + + haveMon = true; } - else + else // not a valid month name { wday = GetWeekDayFromName(token, Name_Full | Name_Abbr); if ( wday != Inv_WeekDay ) @@ -2980,9 +3850,9 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) break; } - haveWDay = TRUE; + haveWDay = true; } - else + else // not a valid weekday name { // try the ordinals static const wxChar *ordinals[] = @@ -3008,7 +3878,7 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) wxTRANSLATE("nineteenth"), wxTRANSLATE("twentieth"), // that's enough - otherwise we'd have problems with - // composite (or not) ordinals otherwise + // composite (or not) ordinals }; size_t n; @@ -3035,25 +3905,27 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) break; } - haveDay = TRUE; + haveDay = true; - day = n + 1; + day = (wxDateTime_t)(n + 1); } } } + + nPosCur = tok.GetPosition(); } // either no more tokens or the scan was stopped by something we couldn't // parse - in any case, see if we can construct a date from what we have if ( !haveDay && !haveWDay ) { - wxLogDebug(_T("no day, no weekday hence no date.")); + wxLogDebug(_T("ParseDate: no day, no weekday hence no date.")); return (wxChar *)NULL; } if ( haveWDay && (haveMon || haveYear || haveDay) && - !(haveMon && haveMon && haveYear) ) + !(haveDay && haveMon && haveYear) ) { // without adjectives (which we don't support here) the week day only // makes sense completely separately or with the full date @@ -3061,6 +3933,37 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) return (wxChar *)NULL; } + if ( !haveWDay && haveYear && !(haveDay && haveMon) ) + { + // may be we have month and day instead of day and year? + if ( haveDay && !haveMon ) + { + if ( day <= 12 ) + { + // exchange day and month + mon = (wxDateTime::Month)(day - 1); + + // we're in the current year then + if ( (year > 0) && (year <= (int)GetNumOfDaysInMonth(Inv_Year, mon)) ) + { + day = (wxDateTime_t)year; + + haveMon = true; + haveYear = false; + } + //else: no, can't exchange, leave haveMon == false + } + } + + if ( !haveMon ) + { + // if we give the year, month and day must be given too + wxLogDebug(_T("ParseDate: day and month should be specified if year is.")); + + return (wxChar *)NULL; + } + } + if ( !haveMon ) { mon = GetCurrentMonth(); @@ -3081,6 +3984,8 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) if ( GetWeekDay() != wday ) { // inconsistency detected + wxLogDebug(_T("ParseDate: inconsistent day/weekday.")); + return (wxChar *)NULL; } } @@ -3092,8 +3997,16 @@ const wxChar *wxDateTime::ParseDate(const wxChar *date) SetToWeekDayInSameWeek(wday); } - // return the pointer to the next char - return p + wxStrlen(p) - wxStrlen(tok.GetString()); + // return the pointer to the first unparsed char + p += nPosCur; + if ( nPosCur && wxStrchr(dateDelimiters, *(p - 1)) ) + { + // if we couldn't parse the token after the delimiter, put back the + // delimiter as well + p--; + } + + return p; } const wxChar *wxDateTime::ParseTime(const wxChar *time) @@ -3118,14 +4031,19 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time) size_t len = timeString.length(); if ( timeString.CmpNoCase(wxString(time, len)) == 0 ) { - Set(stdTimes[n].hour, 0, 0); + // casts required by DigitalMars + Set(stdTimes[n].hour, wxDateTime_t(0), wxDateTime_t(0)); return time + len; } } - // try all time formats we may think about starting with the standard one - const wxChar *result = ParseFormat(time, _T("%X")); + // try all time formats we may think about in the order from longest to + // shortest + + // 12hour with AM/PM? + const wxChar *result = ParseFormat(time, _T("%I:%M:%S %p")); + if ( !result ) { // normally, it's the same, but why not try it? @@ -3134,8 +4052,8 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time) if ( !result ) { - // 12hour with AM/PM? - result = ParseFormat(time, _T("%I:%M:%S %p")); + // 12hour with AM/PM but without seconds? + result = ParseFormat(time, _T("%I:%M %p")); } if ( !result ) @@ -3146,8 +4064,8 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time) if ( !result ) { - // 12hour with AM/PM but without seconds? - result = ParseFormat(time, _T("%I:%M %p")); + // just the hour and AM/PM? + result = ParseFormat(time, _T("%I %p")); } if ( !result ) @@ -3158,8 +4076,9 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time) if ( !result ) { - // just the hour and AM/PM? - result = ParseFormat(time, _T("%I %p")); + // parse the standard format: normally it is one of the formats above + // but it may be set to something completely different by the user + result = ParseFormat(time, _T("%X")); } // TODO: parse timezones @@ -3167,10 +4086,47 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time) return result; } +// ---------------------------------------------------------------------------- +// Workdays and holidays support +// ---------------------------------------------------------------------------- + +bool wxDateTime::IsWorkDay(Country WXUNUSED(country)) const +{ + return !wxDateTimeHolidayAuthority::IsHoliday(*this); +} + +// ============================================================================ +// wxDateSpan +// ============================================================================ + +wxDateSpan WXDLLIMPEXP_BASE operator*(int n, const wxDateSpan& ds) +{ + wxDateSpan ds1(ds); + return ds1.Multiply(n); +} + // ============================================================================ // wxTimeSpan // ============================================================================ +wxTimeSpan WXDLLIMPEXP_BASE operator*(int n, const wxTimeSpan& ts) +{ + return wxTimeSpan(ts).Multiply(n); +} + +// this enum is only used in wxTimeSpan::Format() below but we can't declare +// it locally to the method as it provokes an internal compiler error in egcs +// 2.91.60 when building with -O2 +enum TimeSpanPart +{ + Part_Week, + Part_Day, + Part_Hour, + Part_Min, + Part_Sec, + Part_MSec +}; + // not all strftime(3) format specifiers make sense here because, for example, // a time span doesn't have a year nor a timezone // @@ -3189,66 +4145,299 @@ const wxChar *wxDateTime::ParseTime(const wxChar *time) // %l milliseconds (000 - 999) wxString wxTimeSpan::Format(const wxChar *format) const { - wxCHECK_MSG( format, _T(""), _T("NULL format in wxTimeSpan::Format") ); + wxCHECK_MSG( format, wxEmptyString, _T("NULL format in wxTimeSpan::Format") ); wxString str; - str.Alloc(strlen(format)); + str.Alloc(wxStrlen(format)); - for ( const wxChar *pch = format; pch; pch++ ) + // Suppose we have wxTimeSpan ts(1 /* hour */, 2 /* min */, 3 /* sec */) + // + // Then, of course, ts.Format("%H:%M:%S") must return "01:02:03", but the + // question is what should ts.Format("%S") do? The code here returns "3273" + // in this case (i.e. the total number of seconds, not just seconds % 60) + // because, for me, this call means "give me entire time interval in + // seconds" and not "give me the seconds part of the time interval" + // + // If we agree that it should behave like this, it is clear that the + // interpretation of each format specifier depends on the presence of the + // other format specs in the string: if there was "%H" before "%M", we + // should use GetMinutes() % 60, otherwise just GetMinutes() &c + + // we remember the most important unit found so far + TimeSpanPart partBiggest = Part_MSec; + + for ( const wxChar *pch = format; *pch; pch++ ) { wxChar ch = *pch; - if ( ch == '%' ) + if ( ch == _T('%') ) { - wxString tmp; + // the start of the format specification of the printf() below + wxString fmtPrefix = _T('%'); + + // the number + long n; - ch = *pch++; + ch = *++pch; // get the format spec char switch ( ch ) { default: wxFAIL_MSG( _T("invalid format character") ); // fall through - case '%': - // will get to str << ch below - break; + case _T('%'): + str += ch; + + // skip the part below switch + continue; - case 'D': - tmp.Printf(_T("%d"), GetDays()); + case _T('D'): + n = GetDays(); + if ( partBiggest < Part_Day ) + { + n %= DAYS_PER_WEEK; + } + else + { + partBiggest = Part_Day; + } break; - case 'E': - tmp.Printf(_T("%d"), GetWeeks()); + case _T('E'): + partBiggest = Part_Week; + n = GetWeeks(); break; - case 'H': - tmp.Printf(_T("%02d"), GetHours()); + case _T('H'): + n = GetHours(); + if ( partBiggest < Part_Hour ) + { + n %= HOURS_PER_DAY; + } + else + { + partBiggest = Part_Hour; + } + + fmtPrefix += _T("02"); break; - case 'l': - tmp.Printf(_T("%03ld"), GetMilliseconds().ToLong()); + case _T('l'): + n = GetMilliseconds().ToLong(); + if ( partBiggest < Part_MSec ) + { + n %= 1000; + } + //else: no need to reset partBiggest to Part_MSec, it is + // the least significant one anyhow + + fmtPrefix += _T("03"); break; - case 'M': - tmp.Printf(_T("%02d"), GetMinutes()); + case _T('M'): + n = GetMinutes(); + if ( partBiggest < Part_Min ) + { + n %= MIN_PER_HOUR; + } + else + { + partBiggest = Part_Min; + } + + fmtPrefix += _T("02"); break; - case 'S': - tmp.Printf(_T("%02ld"), GetSeconds().ToLong()); + case _T('S'): + n = GetSeconds().ToLong(); + if ( partBiggest < Part_Sec ) + { + n %= SEC_PER_MIN; + } + else + { + partBiggest = Part_Sec; + } + + fmtPrefix += _T("02"); break; } - if ( !!tmp ) - { - str += tmp; + str += wxString::Format(fmtPrefix + _T("ld"), n); + } + else + { + // normal character, just copy + str += ch; + } + } - // skip str += ch below - continue; - } + return str; +} + +// ============================================================================ +// wxDateTimeHolidayAuthority and related classes +// ============================================================================ + +#include "wx/arrimpl.cpp" + +WX_DEFINE_OBJARRAY(wxDateTimeArray); + +static int wxCMPFUNC_CONV +wxDateTimeCompareFunc(wxDateTime **first, wxDateTime **second) +{ + wxDateTime dt1 = **first, + dt2 = **second; + + return dt1 == dt2 ? 0 : dt1 < dt2 ? -1 : +1; +} + +// ---------------------------------------------------------------------------- +// wxDateTimeHolidayAuthority +// ---------------------------------------------------------------------------- + +wxHolidayAuthoritiesArray wxDateTimeHolidayAuthority::ms_authorities; + +/* static */ +bool wxDateTimeHolidayAuthority::IsHoliday(const wxDateTime& dt) +{ + size_t count = ms_authorities.size(); + for ( size_t n = 0; n < count; n++ ) + { + if ( ms_authorities[n]->DoIsHoliday(dt) ) + { + return true; } + } + + return false; +} - str += ch; +/* static */ +size_t +wxDateTimeHolidayAuthority::GetHolidaysInRange(const wxDateTime& dtStart, + const wxDateTime& dtEnd, + wxDateTimeArray& holidays) +{ + wxDateTimeArray hol; + + holidays.Clear(); + + size_t count = ms_authorities.size(); + for ( size_t nAuth = 0; nAuth < count; nAuth++ ) + { + ms_authorities[nAuth]->DoGetHolidaysInRange(dtStart, dtEnd, hol); + + WX_APPEND_ARRAY(holidays, hol); } - return str; + holidays.Sort(wxDateTimeCompareFunc); + + return holidays.size(); +} + +/* static */ +void wxDateTimeHolidayAuthority::ClearAllAuthorities() +{ + WX_CLEAR_ARRAY(ms_authorities); } + +/* static */ +void wxDateTimeHolidayAuthority::AddAuthority(wxDateTimeHolidayAuthority *auth) +{ + ms_authorities.push_back(auth); +} + +wxDateTimeHolidayAuthority::~wxDateTimeHolidayAuthority() +{ + // required here for Darwin +} + +// ---------------------------------------------------------------------------- +// wxDateTimeWorkDays +// ---------------------------------------------------------------------------- + +bool wxDateTimeWorkDays::DoIsHoliday(const wxDateTime& dt) const +{ + wxDateTime::WeekDay wd = dt.GetWeekDay(); + + return (wd == wxDateTime::Sun) || (wd == wxDateTime::Sat); +} + +size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart, + const wxDateTime& dtEnd, + wxDateTimeArray& holidays) const +{ + if ( dtStart > dtEnd ) + { + wxFAIL_MSG( _T("invalid date range in GetHolidaysInRange") ); + + return 0u; + } + + holidays.Empty(); + + // instead of checking all days, start with the first Sat after dtStart and + // end with the last Sun before dtEnd + wxDateTime dtSatFirst = dtStart.GetNextWeekDay(wxDateTime::Sat), + dtSatLast = dtEnd.GetPrevWeekDay(wxDateTime::Sat), + dtSunFirst = dtStart.GetNextWeekDay(wxDateTime::Sun), + dtSunLast = dtEnd.GetPrevWeekDay(wxDateTime::Sun), + dt; + + for ( dt = dtSatFirst; dt <= dtSatLast; dt += wxDateSpan::Week() ) + { + holidays.Add(dt); + } + + for ( dt = dtSunFirst; dt <= dtSunLast; dt += wxDateSpan::Week() ) + { + holidays.Add(dt); + } + + return holidays.GetCount(); +} + +// ============================================================================ +// other helper functions +// ============================================================================ + +// ---------------------------------------------------------------------------- +// iteration helpers: can be used to write a for loop over enum variable like +// this: +// for ( m = wxDateTime::Jan; m < wxDateTime::Inv_Month; wxNextMonth(m) ) +// ---------------------------------------------------------------------------- + +WXDLLIMPEXP_BASE void wxNextMonth(wxDateTime::Month& m) +{ + wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") ); + + // no wrapping or the for loop above would never end! + m = (wxDateTime::Month)(m + 1); +} + +WXDLLIMPEXP_BASE void wxPrevMonth(wxDateTime::Month& m) +{ + wxASSERT_MSG( m < wxDateTime::Inv_Month, _T("invalid month") ); + + m = m == wxDateTime::Jan ? wxDateTime::Inv_Month + : (wxDateTime::Month)(m - 1); +} + +WXDLLIMPEXP_BASE void wxNextWDay(wxDateTime::WeekDay& wd) +{ + wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") ); + + // no wrapping or the for loop above would never end! + wd = (wxDateTime::WeekDay)(wd + 1); +} + +WXDLLIMPEXP_BASE void wxPrevWDay(wxDateTime::WeekDay& wd) +{ + wxASSERT_MSG( wd < wxDateTime::Inv_WeekDay, _T("invalid week day") ); + + wd = wd == wxDateTime::Sun ? wxDateTime::Inv_WeekDay + : (wxDateTime::WeekDay)(wd - 1); +} + +#endif // wxUSE_DATETIME