Changeset 5684

Timestamp:

Dec 5, 2005, 12:00:48 PM (20 years ago)

Author:

drobbin

Message:

fixed formatting for strings for bug 600, TimeFromISO

Location:

trunk/psLib

Files:

• src/astro/psTime.c (modified) (3 diffs)
• test/astro/tst_psTime_01.c (modified) (2 diffs)
• test/astro/tst_psTime_03.c (modified) (2 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-12 03:37:34 $
+ *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-05 22:00:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1217 +1217 @@
 
     // Create string with milliseconds
-    if (snprintf(timeString, MAX_TIME_STRING_LENGTH, "%s,%1dZ", tempString, ds) < 0) {
+    if (snprintf(timeString, MAX_TIME_STRING_LENGTH, "%s.%1dZ", tempString, ds) < 0) {
         psError(PS_ERR_OS_CALL_FAILED, true, PS_ERRORTEXT_psTime_APPEND_MSEC_FAILED);
     }
@@ -1371 +1371 @@
 
     // Convert YYYY-MM-DDThh:mm:ss.sss in string form to tm time
-    if (sscanf(input, "%d-%d-%dT%d:%d:%d,%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday,
+    if (sscanf(input, "%d-%d-%dT%d:%d:%d.%d", &tmTime.tm_year, &tmTime.tm_mon, &tmTime.tm_mday,
                &tmTime.tm_hour, &tmTime.tm_min, &tmTime.tm_sec,&millisecond) < 7) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_ISOTIME_MALFORMED, input);

trunk/psLib/test/astro/tst_psTime_01.c

@@ -23 +23 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-09-13 01:39:13 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-12-05 22:00:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -92 +92 @@
 const psF64 testTime1JD             = 2453208.265559;
 // Expected ISO string
-const char* testTime1Str     = "2004-07-21T18:22:24,2Z";
-const char* testTime1StrLeap = "2004-07-21T18:22:60,2Z";
+const char* testTime1Str     = "2004-07-21T18:22:24.2Z";
+const char* testTime1StrLeap = "2004-07-21T18:22:60.2Z";
 // Expected timeval values
 const psS32 testTime1TimevalSec = 1090434144;

trunk/psLib/test/astro/tst_psTime_03.c

@@ -11 +11 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-09-13 01:39:13 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-12-05 22:00:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -111 +111 @@
 const char* testTimeBStrUTC[APPB_TESTS] =
     {
-        "1998-12-31T23:59:58,0Z",
-        "1998-12-31T23:59:58,5Z",
-        "1998-12-31T23:59:59,0Z",
-        "1998-12-31T23:59:59,5Z",
-        "1998-12-31T23:59:60,0Z",
-        "1998-12-31T23:59:60,5Z",
-        "1999-01-01T00:00:00,0Z",
-        "1999-01-01T00:00:00,5Z"
+        "1998-12-31T23:59:58.0Z",
+        "1998-12-31T23:59:58.5Z",
+        "1998-12-31T23:59:59.0Z",
+        "1998-12-31T23:59:59.5Z",
+        "1998-12-31T23:59:60.0Z",
+        "1998-12-31T23:59:60.5Z",
+        "1999-01-01T00:00:00.0Z",
+        "1999-01-01T00:00:00.5Z"
     };
 const char* testTimeBStrTAI[APPB_TESTS] =
     {
-        "1999-01-01T00:00:29,0Z",
-        "1999-01-01T00:00:29,5Z",
-        "1999-01-01T00:00:30,0Z",
-        "1999-01-01T00:00:30,5Z",
-        "1999-01-01T00:00:31,0Z",
-        "1999-01-01T00:00:31,5Z",
-        "1999-01-01T00:00:32,0Z",
-        "1999-01-01T00:00:32,5Z"
+        "1999-01-01T00:00:29.0Z",
+        "1999-01-01T00:00:29.5Z",
+        "1999-01-01T00:00:30.0Z",
+        "1999-01-01T00:00:30.5Z",
+        "1999-01-01T00:00:31.0Z",
+        "1999-01-01T00:00:31.5Z",
+        "1999-01-01T00:00:32.0Z",
+        "1999-01-01T00:00:32.5Z"
     };
 const char* testTimeBStrTT[APPB_TESTS] =
     {
-        "1999-01-01T00:01:01,1Z",
-        "1999-01-01T00:01:01,6Z",
-        "1999-01-01T00:01:02,1Z",
-        "1999-01-01T00:01:02,6Z",
-        "1999-01-01T00:01:03,1Z",
-        "1999-01-01T00:01:03,6Z",
-        "1999-01-01T00:01:04,1Z",
-        "1999-01-01T00:01:04,6Z"
+        "1999-01-01T00:01:01.1Z",
+        "1999-01-01T00:01:01.6Z",
+        "1999-01-01T00:01:02.1Z",
+        "1999-01-01T00:01:02.6Z",
+        "1999-01-01T00:01:03.1Z",
+        "1999-01-01T00:01:03.6Z",
+        "1999-01-01T00:01:04.1Z",
+        "1999-01-01T00:01:04.6Z"
     };
 const char* testTimeBStrUT1[APPB_TESTS] =
     {
-        "1998-12-31T23:59:58,7Z",
-        "1998-12-31T23:59:59,2Z",
-        "1998-12-31T23:59:59,7Z",
-        "1998-12-31T23:59:60,2Z",
-        "1998-12-31T23:59:60,7Z",
-        "1999-01-01T00:00:00,2Z",
-        "1999-01-01T00:00:00,7Z",
-        "1999-01-01T00:00:01,2Z"
+        "1998-12-31T23:59:58.7Z",
+        "1998-12-31T23:59:59.2Z",
+        "1998-12-31T23:59:59.7Z",
+        "1998-12-31T23:59:60.2Z",
+        "1998-12-31T23:59:60.7Z",
+        "1999-01-01T00:00:00.2Z",
+        "1999-01-01T00:00:00.7Z",
+        "1999-01-01T00:00:01.2Z"
     };