use gmtime for time-only calc
authormiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 24 Mar 2008 18:24:52 +0000 (18:24 +0000)
committermiker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Mon, 24 Mar 2008 18:24:52 +0000 (18:24 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@9125 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/src/c-apps/oils_cstore.c

index 9b87c8e..440ec4e 100644 (file)
@@ -3202,13 +3202,15 @@ static jsonObject* oilsMakeFieldmapperFromResult( dbi_result result, osrfHash* m
 
                                        _tmp_dt = dbi_result_get_datetime(result, columnName);
 
-                                       localtime_r( &_tmp_dt, &gmdt );
 
                                        if (!(attr & DBI_DATETIME_DATE)) {
-                                               strftime(dt_string, sizeof(dt_string), "%T%z", &gmdt);
+                                               gmtime_r( &_tmp_dt, &gmdt );
+                                               strftime(dt_string, sizeof(dt_string), "%T", &gmdt);
                                        } else if (!(attr & DBI_DATETIME_TIME)) {
+                                               localtime_r( &_tmp_dt, &gmdt );
                                                strftime(dt_string, sizeof(dt_string), "%F", &gmdt);
                                        } else {
+                                               localtime_r( &_tmp_dt, &gmdt );
                                                strftime(dt_string, sizeof(dt_string), "%FT%T%z", &gmdt);
                                        }
 
@@ -3281,13 +3283,15 @@ static jsonObject* oilsMakeJSONFromResult( dbi_result result ) {
 
                                        _tmp_dt = dbi_result_get_datetime(result, columnName);
 
-                                       localtime_r( &_tmp_dt, &gmdt );
 
                                        if (!(attr & DBI_DATETIME_DATE)) {
-                                               strftime(dt_string, sizeof(dt_string), "%T%z", &gmdt);
+                                               gmtime_r( &_tmp_dt, &gmdt );
+                                               strftime(dt_string, sizeof(dt_string), "%T", &gmdt);
                                        } else if (!(attr & DBI_DATETIME_TIME)) {
+                                               localtime_r( &_tmp_dt, &gmdt );
                                                strftime(dt_string, sizeof(dt_string), "%F", &gmdt);
                                        } else {
+                                               localtime_r( &_tmp_dt, &gmdt );
                                                strftime(dt_string, sizeof(dt_string), "%FT%T%z", &gmdt);
                                        }