vaclavt/mlisp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix in date functions

Browse Source
This commit is contained in:
VaclavT
2021-08-31 19:01:03 +02:00
parent dc9e5317e4
commit 7ba6f3bef3
2 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
ml_date.cpp
View File

@@ -1,8 +1,7 @@
#include "ml_date.h"
long now() {
// get-universal-time
long now() { // get-universal-time
time_t t = std::time(0);
long int now = static_cast<long int>(t);
@@ -23,16 +22,56 @@ std::string date_to_string(const long datetime, const std::string format) {
return "invalid argument";
}
std::istringstream string_to_date_in_ss;
time_t time_to_epoch ( const struct tm *ltm, int utcdiff ) {
// const int mon_days [] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
const int mon_days [] = {31, 31+28, 31+28+31,
31+28+31+30, 31+28+31+30+31, 31+28+31+30+31+30,
31+28+31+30+31+30+31, 31+28+31+30+31+30+31+31, 31+28+31+30+31+30+31+31+30,
31+28+31+30+31+30+31+31+30+31, 31+28+31+30+31+30+31+31+30+31+30, 31+28+31+30+31+30+31+31+30+31+30+31};
long tyears, tdays, leaps, utc_hrs;
int i;
tyears = ltm->tm_year - 70 ; // tm->tm_year is from 1900.
leaps = (tyears + 2) / 4; // no of next two lines until year 2100.
//i = (ltm->tm_year – 100) / 100;
//leaps -= ( (i/4)*3 + i%4 );
// tdays = 0;
// for (i=0; i < ltm->tm_mon; i++) tdays += mon_days[i];
tdays = mon_days[ltm->tm_mon-1];
tdays += ltm->tm_mday-1; // days of month passed.
tdays = tdays + (tyears * 365) + leaps;
utc_hrs = ltm->tm_hour + utcdiff/3600; // for your time zone.
return (tdays * 86400) + (utc_hrs * 3600) + (ltm->tm_min * 60) + ltm->tm_sec;
}
long string_to_date(const std::string &datestr, const std::string &format) {
// format for example "%d.%m.%Y";
string_to_date_in_ss.clear();
string_to_date_in_ss.str(datestr);
struct tm tm;
memset(&tm, 0, sizeof(tm));
if (strptime(datestr.c_str(), format.c_str(), &tm)) {
time_t curTime;
struct tm * timeinfo;
time(&curTime );
timeinfo = localtime(&curTime);
timeinfo->tm_year = tm.tm_year;
timeinfo->tm_mon = tm.tm_mon;
timeinfo->tm_mday = tm.tm_mday;
timeinfo->tm_hour = tm.tm_hour;
timeinfo->tm_min = tm.tm_min;
timeinfo->tm_sec = tm.tm_sec;
return time_to_epoch(timeinfo, -1 * timeinfo->tm_gmtoff);
}
date::sys_seconds tp;
date::from_stream(string_to_date_in_ss, format.c_str(), tp);
return tp.time_since_epoch().count();
// throw Exception("invalid date string or format");
return -1;
}
@@ -59,5 +98,5 @@ long add_to_date(const long datetime, const long quantity, const std::string &pa
// TODO exception here
}
return mktime(tm);
return mktime(tm); // mktime is quite slow!
}