Skip to content

Support Microseconds in RBUS_DATETIME Type #447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sreedevi29 wants to merge 1 commit into
base: develop
Choose a base branch
from
+47 −3
Open

Support Microseconds in RBUS_DATETIME Type #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/rbus_value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ struct tm32
int32_t tm_wday; /* Day of week. [0-6] */
int32_t tm_yday; /* Days in year.[0-365] */
int32_t tm_isdst; /* DST. [-1/0/1]*/
int32_t tm_usec; /* microseconds [0-999999] */
};

typedef struct _rbusDateTime {
Expand Down
49 changes: 46 additions & 3 deletions src/rbus/rbus_value.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ char* rbusValue_ToString(rbusValue_t v, char* buf, size_t buflen)
n = snprintf(p, 0, "%.*f", DBL_DIG, v->d.f64)+1;
break;
case RBUS_DATETIME:
n = snprintf(p, 0, "0000-00-00T00:00:00+00:00") + 1;
n = snprintf(p, 0, "0000-00-00T00:00:00.000000+00:00") + 1;
break;
default:
n = snprintf(p, 0, "FIXME TYPE %d", v->type)+1;
Expand Down Expand Up @@ -373,24 +373,48 @@ char* rbusValue_ToString(rbusValue_t v, char* buf, size_t buflen)
snprintf(tmpBuff, 40, "Z");
}
if(0 == v->d.tv.m_time.tm_year) {
snprintf(p, n, "%04d-%02d-%02dT%02d:%02d:%02d%s", v->d.tv.m_time.tm_year,
if(v->d.tv.m_time.tm_usec >= 0)
{
snprintf(p, n, "%04d-%02d-%02dT%02d:%02d:%02d.%06d%s", v->d.tv.m_time.tm_year,
v->d.tv.m_time.tm_mon,
v->d.tv.m_time.tm_mday,
v->d.tv.m_time.tm_hour,
v->d.tv.m_time.tm_min,
v->d.tv.m_time.tm_sec,
v->d.tv.m_time.tm_usec,
tmpBuff);
} else {
snprintf(p, n, "%04d-%02d-%02dT%02d:%02d:%02d%s", v->d.tv.m_time.tm_year,
v->d.tv.m_time.tm_mon,
v->d.tv.m_time.tm_mday,
v->d.tv.m_time.tm_hour,
v->d.tv.m_time.tm_min,
v->d.tv.m_time.tm_sec,
tmpBuff);
}
} else {
/* tm_mon represents month from 0 to 11. So increment tm_mon by 1.
tm_year represents years since 1900. So add 1900 to tm_year.
*/
snprintf(p, n, "%04d-%02d-%02dT%02d:%02d:%02d%s", v->d.tv.m_time.tm_year+1900,
if(v->d.tv.m_time.tm_usec >= 0)
{
snprintf(p, n, "%04d-%02d-%02dT%02d:%02d:%02d.%06d%s", v->d.tv.m_time.tm_year+1900,
v->d.tv.m_time.tm_mon+1,
v->d.tv.m_time.tm_mday,
v->d.tv.m_time.tm_hour,
v->d.tv.m_time.tm_min,
v->d.tv.m_time.tm_sec,
v->d.tv.m_time.tm_usec,
tmpBuff);
} else {
snprintf(p, n, "%04d-%02d-%02dT%02d:%02d:%02d%s", v->d.tv.m_time.tm_year+1900,
v->d.tv.m_time.tm_mon+1,
v->d.tv.m_time.tm_mday,
v->d.tv.m_time.tm_hour,
v->d.tv.m_time.tm_min,
v->d.tv.m_time.tm_sec,
tmpBuff);
}
}
break;
}
Expand Down Expand Up @@ -1226,6 +1250,7 @@ bool rbusValue_SetFromString(rbusValue_t value, rbusValueType_t type, const char
{
struct tm tv;
rbusDateTime_t tvm = {{0},{0}};
tvm.m_time.tm_usec = -1;
if(0 != strncmp(pStringInput,"0000-",5)) {
char *pRet = NULL;
if(strstr(pStringInput,"T"))
Expand All @@ -1237,6 +1262,18 @@ bool rbusValue_SetFromString(rbusValue_t value, rbusValueType_t type, const char
return false;
}
rbusValue_MarshallTMtoRBUS(&tvm, &tv);

if (*pRet == '.')
{
int usec = 0;
// Read up to 6 digits after the dot
if(sscanf(pRet + 1, "%6d", &usec) == 1)
tvm.m_time.tm_usec = usec; // store full microseconds
pRet++;
while(*pRet && isdigit((unsigned char)*(pRet)))
pRet++;
}

if((RBUS_TIMEZONE_LEN == strlen(pRet)) &&
(isdigit((int)pRet[1]) &&
isdigit((int)pRet[2]) &&
Expand All @@ -1247,6 +1284,12 @@ bool rbusValue_SetFromString(rbusValue_t value, rbusValueType_t type, const char
sscanf(pRet+1,"%02d:%02d",&(tvm.m_tz.m_tzhour), &(tvm.m_tz.m_tzmin));
}
}
else {
if(strchr(pStringInput,'.'))
tvm.m_time.tm_usec = 0;
else
tvm.m_time.tm_usec = -1;
}
rbusValue_SetTime(value, &tvm);
}
break;
Expand Down
Loading