Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 3704) +++ /trunk/psLib/src/astro/psTime.c (revision 3705) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-18 23:13:37 $ + * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -812,5 +812,5 @@ } -char* psTimeToISOTime(const psTime *time) +char* psTimeToISO(const psTime *time) { psS32 ms = 0; @@ -979,5 +979,5 @@ } -psTime* psTimeFromISOTime(const char *time) +psTime* psTimeFromISO(const char *time) { psS32 millisecond; Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 3704) +++ /trunk/psLib/src/astro/psTime.h (revision 3705) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-18 23:13:37 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -186,5 +186,5 @@ * @return char*: Pointer null terminated array of chars in ISO time. */ -char* psTimeToISOTime( +char* psTimeToISO( const psTime* time ///< Input time to be converted. ); @@ -237,5 +237,5 @@ * @return psTime*: time */ -psTime* psTimeFromISOTime( +psTime* psTimeFromISO( const char* time ///< Input time to be converted. ); Index: /trunk/psLib/src/astronomy/psTime.c =================================================================== --- /trunk/psLib/src/astronomy/psTime.c (revision 3704) +++ /trunk/psLib/src/astronomy/psTime.c (revision 3705) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-18 23:13:37 $ + * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -812,5 +812,5 @@ } -char* psTimeToISOTime(const psTime *time) +char* psTimeToISO(const psTime *time) { psS32 ms = 0; @@ -979,5 +979,5 @@ } -psTime* psTimeFromISOTime(const char *time) +psTime* psTimeFromISO(const char *time) { psS32 millisecond; Index: /trunk/psLib/src/astronomy/psTime.h =================================================================== --- /trunk/psLib/src/astronomy/psTime.h (revision 3704) +++ /trunk/psLib/src/astronomy/psTime.h (revision 3705) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-18 23:13:37 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -186,5 +186,5 @@ * @return char*: Pointer null terminated array of chars in ISO time. */ -char* psTimeToISOTime( +char* psTimeToISO( const psTime* time ///< Input time to be converted. ); @@ -237,5 +237,5 @@ * @return psTime*: time */ -psTime* psTimeFromISOTime( +psTime* psTimeFromISO( const char* time ///< Input time to be converted. ); Index: /trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3704) +++ /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3705) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ + * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ printPositiveTestHeader(stdout,"psTime", "Convert psTime to ISO time"); char *isoString; - isoString = psTimeToISOTime(testTime); + isoString = psTimeToISO(testTime); printf("%s\n", isoString); if(strncmp(isoString, testString, 256)) { @@ -78,5 +78,5 @@ printPositiveTestHeader(stdout,"psTime", "Convert ISO time to psTime"); psTime *timeD = NULL; - timeD = psTimeFromISOTime(isoString); + timeD = psTimeFromISO(isoString); printf("psTime: Seconds = %lld Microseconds = %u\n", (long long int)timeD->sec, @@ -206,5 +206,5 @@ char *testString2 = "2004-09-10T1:00:00.00Z"; psTime* testTime2 = NULL; - testTime2 = psTimeFromISOTime(testString2); + testTime2 = psTimeFromISO(testString2); double dblTime = psTimeToLST(testTime2, 1); printf("LST (rad): %lf\n", dblTime); Index: /trunk/psLib/test/astronomy/tst_psTime_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 3704) +++ /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 3705) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,10 +25,10 @@ // Test A - Incorrect ISO time data printNegativeTestHeader(stdout,"psTime", "Incorrect ISO time data", "Time not allowed", 0); - psTimeFromISOTime("2004-99-21T18:22:24.272Z"); - psTimeFromISOTime("2004-07-99T18:22:24.272Z"); - psTimeFromISOTime("2004-07-21T99:22:24.272Z"); - psTimeFromISOTime("2004-07-21T18:99:24.272Z"); - psTimeFromISOTime("2004-07-21T18:22:99.272Z"); - psTimeFromISOTime("2004-07-21T18:22:24.-999Z"); + psTimeFromISO("2004-99-21T18:22:24.272Z"); + psTimeFromISO("2004-07-99T18:22:24.272Z"); + psTimeFromISO("2004-07-21T99:22:24.272Z"); + psTimeFromISO("2004-07-21T18:99:24.272Z"); + psTimeFromISO("2004-07-21T18:22:99.272Z"); + psTimeFromISO("2004-07-21T18:22:24.-999Z"); printFooter(stdout, "psTime", "Incorrect ISO time data", true); Index: /trunk/psLib/test/astronomy/tst_psTime_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 3704) +++ /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 3705) @@ -19,6 +19,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-18 23:13:39 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-18 23:30:54 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -155,8 +155,8 @@ psTime *time7a = NULL; psTime *timeOut7 = NULL; - time7a = psTimeFromISOTime("1998-12-31T23:59:45.00"); + time7a = psTimeFromISO("1998-12-31T23:59:45.00"); time7a->type = PS_TIME_UTC; timeOut7 = psTimeMath(time7a, time7b); - out7 = psTimeToISOTime(timeOut7); + out7 = psTimeToISO(timeOut7); printf("%s\n", out7); printFooter(stdout, "psTime", "Test G - Add two times across leapsecond boundary", true); @@ -168,6 +168,6 @@ psTime *time8a = NULL; psTime *time8b = NULL; - time8a = psTimeFromISOTime("2004-12-18T1:00:00.00"); - time8b = psTimeFromISOTime("1972-1-1T1:00:00.00"); + time8a = psTimeFromISO("2004-12-18T1:00:00.00"); + time8b = psTimeFromISO("1972-1-1T1:00:00.00"); out = psTimeLeapSecondDelta(time8a, time8b); printf("%lld\n", (long long int)out); Index: /trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr (revision 3704) +++ /trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr (revision 3705) @@ -1,13 +1,13 @@ -