summaryrefslogtreecommitdiff
path: root/src/c
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-10-30 14:57:15 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-10-30 14:57:15 -0400
commitbca91774855a83f677f1a53abd3081258dc3a95c (patch)
tree40d3f3abaf19f69f1039b4eb6e5fc2d4cb0744ff /src/c
parent49330740529a9d1448bff0fd3123e8946ab3915d (diff)
Reading timestamps from SQL
Diffstat (limited to 'src/c')
-rw-r--r--src/c/urweb.c28
1 files changed, 21 insertions, 7 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 7a160637..df3ce6e1 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -728,6 +728,7 @@ uw_unit uw_Basis_htmlifyBool_w(uw_context ctx, uw_Basis_bool b) {
}
#define TIME_FMT "%x %X"
+#define TIME_FMT_PG "%Y-%m-%d %T"
uw_Basis_string uw_Basis_htmlifyTime(uw_context ctx, uw_Basis_time t) {
size_t len;
@@ -950,10 +951,10 @@ uw_Basis_bool *uw_Basis_stringToBool(uw_context ctx, uw_Basis_string s) {
}
uw_Basis_time *uw_Basis_stringToTime(uw_context ctx, uw_Basis_string s) {
- char *end = strchr(s, 0);
+ char *dot = strchr(s, '.'), *end = strchr(s, 0);
struct tm stm;
- if (strptime(s, TIME_FMT, &stm) == end) {
+ if ((dot ? (*dot = 0, strptime(s, TIME_FMT_PG, &stm)) : strptime(s, TIME_FMT, &stm)) == end) {
uw_Basis_time *r = uw_malloc(ctx, sizeof(uw_Basis_time));
*r = mktime(&stm);
return r;
@@ -992,11 +993,24 @@ uw_Basis_bool uw_Basis_stringToBool_error(uw_context ctx, uw_Basis_string s) {
}
uw_Basis_time uw_Basis_stringToTime_error(uw_context ctx, uw_Basis_string s) {
- char *end = strchr(s, 0);
+ char *dot = strchr(s, '.'), *end = strchr(s, 0);
struct tm stm = {};
- if (strptime(s, TIME_FMT, &stm) == end)
- return mktime(&stm);
- else
- uw_error(ctx, FATAL, "Can't parse time: %s", s);
+ if (dot) {
+ *dot = 0;
+ if (strptime(s, TIME_FMT_PG, &stm)) {
+ *dot = '.';
+ return mktime(&stm);
+ }
+ else {
+ *dot = '.';
+ uw_error(ctx, FATAL, "Can't parse time: %s", s);
+ }
+ }
+ else {
+ if (strptime(s, TIME_FMT, &stm) == end)
+ return mktime(&stm);
+ else
+ uw_error(ctx, FATAL, "Can't parse time: %s", s);
+ }
}