Changeset 6269 for trunk/psLib/src/astro/psTime.c

Timestamp:

Jan 31, 2006, 2:17:44 PM (20 years ago)

Author:

drobbin

Message:

Updated psTimeFromISO to use 2nd argument, psTimeType and output the desired type of time.

File:

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

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.80 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-31 23:24:21 $
+ *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-01 00:17:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1498 +1498 @@
     // Check for NULL string
     PS_ASSERT_PTR_NON_NULL(input,NULL);
+    PS_ASSERT_INT_WITHIN_RANGE(type, PS_TIME_TAI, PS_TIME_TT, NULL);
 
     // Convert YYYY-MM-DDThh:mm:ss.sss in string form to tm time
@@ -1521 +1522 @@
     outTime = p_psTimeFromTM(&tmTime);
     outTime->nsec = millisecond * 1000000;
-    outTime->type = type;
+    //    outTime->type = type;
+    if (type != PS_TIME_TAI) {
+        outTime = psTimeConvert(outTime, type);
+    }
 
     return outTime;