Changeset 5015

Timestamp:

Sep 12, 2005, 3:09:58 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• astro/Makefile.am (modified) (1 diff)
• astro/psTime.c (modified) (10 diffs)
• astro/psTime.h (modified) (3 diffs)
• sys/psString.h (modified) (2 diffs)

trunk/psLib/src/astro/Makefile.am

@@ -1 +1 @@
 #Makefile for astronomy functions of psLib
 #
-AM_CFLAGS=$(CFLAGS) -DPS_CONFIG_FILE_DEFAULT=\"$(sysconfdir)/pslib/psTime.config\"
+AM_CFLAGS=$(CFLAGS) -DPS_CONFIG_FILE_DEFAULT=\"$(sysconfdir)/pslib/pslib.config\"
 
 noinst_LTLIBRARIES = libpslibastro.la

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-02 21:32:03 $
+ *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-13 01:09:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -88 +88 @@
 static char *cleanString(char *inString, int sLen);
 static char* getToken(char **inString, char *delimiter, psParseErrorType *status);
-static psF64 searchTables(psF64 index, psU64 column, char *metadataTableNames[],
-                          psU32 nTables, psLookupStatusType* status);
 static psTime* convertTimeTAIUTC(psTime* time);
 static psTime* convertTimeUTCTAI(psTime* time);
@@ -156 +154 @@
 }
 
-// get the psTime.config filename by checking environment variable first, then original installation area.
+// get the pslib.config filename by checking environment variable first, then original installation area.
 char* p_psGetConfigFileName()
 {
@@ -171 +169 @@
 // Searches time tables in priority order and performs interpolation if input index value is within a table.
 // If the index value is out of range, the status is set accordingly.
-static psF64 searchTables(psF64 index, psU64 column, char *metadataTableNames[],
-                          psU32 nTables, psLookupStatusType* status)
+psF64 p_psTimeSearchTables(psF64 index, psU64 column, char *metadataTableNames[],
+                           psU32 nTables, psLookupStatusType* status)
 {
     char*            tableName          = NULL;
@@ -179 +177 @@
     psMetadataItem*  tableMetadataItem  = NULL;
 
-    // Check time metadata. Function call reports errors.
-    if(timeMetadata == NULL) {
-        if(!p_psTimeInit(p_psGetConfigFileName()))
-            *status = PS_LOOKUP_ERROR;
+    // Check if psTime tables are already loaded
+    if(!p_psTimeInit(p_psGetConfigFileName())) {
+        *status = PS_LOOKUP_ERROR;
         return NAN;
     }
@@ -254 +251 @@
     char metadataTableNames[4][MAX_STRING_LENGTH] = {"daily", "eopc",  "finals", "tai"};
 
-    // Read time config file
+    // Check if the p_psTimeInit has already been ran
+    if (timeMetadata != NULL) {
+        return true;
+    }
+
+    // Read config file
     timeMetadata = psMetadataConfigParse(timeMetadata, &nFail, fileName, true);
     if(timeMetadata == NULL) {
@@ -847 +849 @@
     // Attempt to find value through table lookup and interpolation
     mjd = psTimeToMJD(time);
-    result = searchTables(mjd,tableColumn,metadataTableNames,nTables,&status);
+    result = p_psTimeSearchTables(mjd,tableColumn,metadataTableNames,nTables,&status);
 
     // Value could not be found through table lookup and interpolation
@@ -855 +857 @@
         psLogMsg(__func__,PS_LOG_WARN,PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES,mjd,"UT1-UTC");
 
-        // Lookup value from time metadata loaded from psTime.config
+        // Lookup value from time metadata loaded from pslib.config
         tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.before.dut");
         if(tableMetadataItem == NULL) {
@@ -926 +928 @@
     // Attempt to find value through table lookup and interpolation
     mjd = psTimeToMJD(time);
-    //    x = searchTables(mjd, 0, &xStatus, metadataTableNames, nTables);
-    x = searchTables(mjd, 0, metadataTableNames, nTables,&xStatus);
-    //    y = searchTables(mjd, 0, &yStatus, metadataTableNames, nTables);
-    y = searchTables(mjd, 0, metadataTableNames, nTables,&yStatus);
+    //    x = p_psTimeSearchTables(mjd, 0, &xStatus, metadataTableNames, nTables);
+    x = p_psTimeSearchTables(mjd, 0, metadataTableNames, nTables,&xStatus);
+    //    y = p_psTimeSearchTables(mjd, 0, &yStatus, metadataTableNames, nTables);
+    y = p_psTimeSearchTables(mjd, 0, metadataTableNames, nTables,&yStatus);
 
     // Value could not be found through table lookup and interpolation
@@ -1037 +1039 @@
     PS_ASSERT_INT_WITHIN_RANGE(time->nsec,0,(psU32)((1e9)-1),NAN);
 
-    // Check time metadata
-    if(timeMetadata == NULL) {
-        if(!p_psTimeInit(p_psGetConfigFileName())) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND, "psTime.config");
-            return 0.0;
-        }
+    // Check if psTime tables are loaded/loadable
+    if(!p_psTimeInit(p_psGetConfigFileName())) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND,
+                p_psGetConfigFileName());
+        return 0.0;
     }
 

trunk/psLib/src/astro/psTime.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-02 21:32:03 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-13 01:09:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psType.h"
 #include "psImage.h"
+#include "psLookupTable.h"
 #include "psCoord.h"
 
@@ -360 +361 @@
 char* p_psGetConfigFileName();
 
+psF64 p_psTimeSearchTables(
+    psF64 index,
+    psU64 column,
+    char *metadataTableNames[],
+    psU32 nTables,
+    psLookupStatusType* status
+);
+
 /// @}
 

trunk/psLib/src/sys/psString.h

@@ -13 +13 @@
  *  @author Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-30 00:33:36 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-13 01:09:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
 psString psStringNCopy(
     const char *string,                ///< Input string of characters to copy
-    unsigned int nChar                          ///< Number of bytes to allocate for string copy
+    unsigned int nChar                 ///< Number of bytes to allocate for string copy
 );