Changeset 10736

Timestamp:

Dec 14, 2006, 1:02:46 PM (20 years ago)

Author:

magnier

Message:

two fixes: catch fractional seconds in psTimeStrptime, allow YYYY-MM-DD with implied 00:00:00 in psTimeFromISO

File:

• trunk/psLib/src/astro/psTime.c (modified) (6 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-21 19:23:02 $
+ *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-12-14 23:02:46 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +25 @@
 #include "psError.h"
 #include "psLogMsg.h"
+#include "psTrace.h"
 #include "psMemory.h"
 #include "psAbort.h"
@@ -1498 +1499 @@
     psTime *outTime = psTimeStrptime(input, "%Y-%m-%dT%H:%M:%S");
     if (!outTime) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified ISO Time string, '%s', is malformed.  Must be in 'YYYY-MM-DDThh:mm:ss.sss' format."), input);
-        return NULL;
+        // try for date with assumed 00:00:00 time
+        outTime = psTimeStrptime(input, "%Y-%m-%d");
+        if (!outTime) {
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified ISO Time string, '%s', is malformed.  Must be in 'YYYY-MM-DDThh:mm:ss.sss' format."), input);
+            return NULL;
+        }
     }
 
@@ -1640 +1645 @@
     PS_ASSERT_PTR_NON_NULL(format, NULL);
 
+    double fractionalSeconds = 0.0;
+
     struct tm tmTime;
+    tmTime.tm_year = tmTime.tm_mon = tmTime.tm_mday = 0;
+    tmTime.tm_hour = tmTime.tm_min = tmTime.tm_sec = 0;
     char *lastChar = strptime(s, format, &tmTime);
     if (!lastChar) {
@@ -1648 +1657 @@
 
     if (*lastChar != '\0') {
-        psWarning("time string was not completely consumed\n");
+        psTrace("psLib.astrom", 3, "handling fractional second in time string\n");
+        // XXXXXXXXXXXXXXX
+        // XXX this is a really stupid error:
+        // we are dropping the fractional seconds with this conversion
+        // I've put in a proposed fix, but PLEASE test!!!
+        if (*lastChar == '.') {
+            char *reallyLast;
+            fractionalSeconds = strtod (lastChar, &reallyLast);
+            if (!reallyLast) {
+                psWarning("time string was not completely consumed\n");
+            }
+        }
     }
 
@@ -1657 +1677 @@
     }
 
+    time->nsec += fractionalSeconds * 1e9;
     return time;
 }