Changeset 3220 for trunk/psLib/src

Timestamp:

Feb 14, 2005, 5:02:53 PM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• astro/psTime.c (modified) (5 diffs)
• astro/psTime.h (modified) (2 diffs)
• astronomy/psTime.c (modified) (5 diffs)
• astronomy/psTime.h (modified) (2 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-10 02:36:41 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 03:02:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
 psF64 searchTables(psF64 index, psU64 column, psLookupStatusType *status, char *metadataTableNames[], psU32 nTables);
 
+
 /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null
  *  terminated copy of the original input string. */
@@ -133 +134 @@
     return cleanToken;
 }
+
+// get the psTime.config filename by checking environment variable first, then original installation area.
+char* p_psGetConfigFileName()
+{
+    char* filename = getenv("PS_CONFIG_FILE");
+
+    if (filename == NULL) { // environment variable not found
+        filename = PS_CONFIG_FILE_DEFAULT; // this should come from configure.ac
+    }
+
+    return filename;
+}
+
 
 /** Searches time tables in priority order and performs interpolation if input index value is within a table.
@@ -148 +162 @@
     // Check time metadata. Function call reports errors.
     if(timeMetadata == NULL) {
-        if(!p_psTimeInit(CONFIG_FILE))
+        if(!p_psTimeInit(p_psGetConfigFileName()))
             return 0.0;
     }
@@ -705 +719 @@
     // Check time metadata
     if(timeMetadata == NULL) {
-        if(!p_psTimeInit(CONFIG_FILE)) {
+        if(!p_psTimeInit(p_psGetConfigFileName())) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND, "psTime.config");
             return 0.0;

trunk/psLib/src/astro/psTime.h

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-16 18:52:51 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 03:02:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -284 +284 @@
 );
 
+/** Get the filename of the psLib configuration file.
+ *
+ *  @return char*          If a PS_CONFIG_FILE environment variable exists,
+ *                         that is returned, otherwise the default location
+ *                         dependent on the installation location.
+ */
+char* p_psGetConfigFileName();
+
 /// @}
 

trunk/psLib/src/astronomy/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-10 02:36:41 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 03:02:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
 psF64 searchTables(psF64 index, psU64 column, psLookupStatusType *status, char *metadataTableNames[], psU32 nTables);
 
+
 /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null
  *  terminated copy of the original input string. */
@@ -133 +134 @@
     return cleanToken;
 }
+
+// get the psTime.config filename by checking environment variable first, then original installation area.
+char* p_psGetConfigFileName()
+{
+    char* filename = getenv("PS_CONFIG_FILE");
+
+    if (filename == NULL) { // environment variable not found
+        filename = PS_CONFIG_FILE_DEFAULT; // this should come from configure.ac
+    }
+
+    return filename;
+}
+
 
 /** Searches time tables in priority order and performs interpolation if input index value is within a table.
@@ -148 +162 @@
     // Check time metadata. Function call reports errors.
     if(timeMetadata == NULL) {
-        if(!p_psTimeInit(CONFIG_FILE))
+        if(!p_psTimeInit(p_psGetConfigFileName()))
             return 0.0;
     }
@@ -705 +719 @@
     // Check time metadata
     if(timeMetadata == NULL) {
-        if(!p_psTimeInit(CONFIG_FILE)) {
+        if(!p_psTimeInit(p_psGetConfigFileName())) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND, "psTime.config");
             return 0.0;

trunk/psLib/src/astronomy/psTime.h

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-16 18:52:51 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-15 03:02:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -284 +284 @@
 );
 
+/** Get the filename of the psLib configuration file.
+ *
+ *  @return char*          If a PS_CONFIG_FILE environment variable exists,
+ *                         that is returned, otherwise the default location
+ *                         dependent on the installation location.
+ */
+char* p_psGetConfigFileName();
+
 /// @}