sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parse %m/%d/%Y %H:%M:%S as an input date/time

Browse source 
This is to support reading of Timelog files.
This commit is contained in:
John Wiegley 2010-12-04 12:46:32 -05:00
parent 9bdb384df7
commit 0be39fce6a
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/times.cc
View file

@ -185,6 +185,7 @@ namespace {
gregorian::date_facet> date_io_t; gregorian::date_facet> date_io_t;
shared_ptr<datetime_io_t> input_datetime_io; shared_ptr<datetime_io_t> input_datetime_io;
shared_ptr<datetime_io_t> timelog_datetime_io;
shared_ptr<date_io_t> input_date_io; shared_ptr<date_io_t> input_date_io;
shared_ptr<datetime_io_t> written_datetime_io; shared_ptr<datetime_io_t> written_datetime_io;
shared_ptr<date_io_t> written_date_io; shared_ptr<date_io_t> written_date_io;
@ -318,8 +319,12 @@ datetime_t parse_datetime(const char * str)
*p = '/'; *p = '/';
datetime_t when = input_datetime_io->parse(buf); datetime_t when = input_datetime_io->parse(buf);
if (when.is_not_a_date_time()) if (when.is_not_a_date_time()) {
when = timelog_datetime_io->parse(buf);
if (when.is_not_a_date_time()) {
throw_(date_error, _("Invalid date/time: %1") << str); throw_(date_error, _("Invalid date/time: %1") << str);
}
}
return when; return when;
} }
@ -1770,6 +1775,7 @@ void times_initialize()
{ {
if (! is_initialized) { if (! is_initialized) {
input_datetime_io.reset(new datetime_io_t("%Y/%m/%d %H:%M:%S", true)); input_datetime_io.reset(new datetime_io_t("%Y/%m/%d %H:%M:%S", true));
timelog_datetime_io.reset(new datetime_io_t("%m/%d/%Y %H:%M:%S", true));
written_datetime_io.reset(new datetime_io_t("%Y/%m/%d %H:%M:%S", false)); written_datetime_io.reset(new datetime_io_t("%Y/%m/%d %H:%M:%S", false));
written_date_io.reset(new date_io_t("%Y/%m/%d", false)); written_date_io.reset(new date_io_t("%Y/%m/%d", false));
@ -1790,6 +1796,7 @@ void times_shutdown()
{ {
if (is_initialized) { if (is_initialized) {
input_datetime_io.reset(); input_datetime_io.reset();
timelog_datetime_io.reset();
input_date_io.reset(); input_date_io.reset();
written_datetime_io.reset(); written_datetime_io.reset();
written_date_io.reset(); written_date_io.reset();