Changeset 7942 for trunk/psLib/src/astro

Timestamp:

Jul 20, 2006, 2:59:07 AM (20 years ago)

Author:

rhl

Message:

Return error indication (NAN/NULL) in case of error, don't just call psError

File:

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

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.90 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.91 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-20 12:59:07 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -387 +387 @@
 
     // Read time tables
+    bool no_problem = true;  // True if we've detected no errors
     namesPtr = tableNames;
     while((tableName=getToken(&namesPtr, " ", &status)) != NULL) {
@@ -403 +404 @@
         tableFormat = getToken(&formatPtr,",",&status);
         if(tableFormat == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
+            psError(PS_ERR_BAD_PARAMETER_VALUE,no_problem,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                     "psLib.time.tables.format");
+            no_problem = false;
         }
 
@@ -412 +414 @@
             numLines = psLookupTableRead(table);
         } else {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i+1, numTables);
+            psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem,
+                    PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i+1, numTables);
+            no_problem = false;
         }
 
@@ -424 +428 @@
                 foundTable = true;
             } else if(foundTable==false && j==numTables-1) {
-                psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, j, numTables);
+                psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem,
+                        PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, j, numTables);
+                no_problem = false;
             }
         }
@@ -438 +444 @@
 
     if(numTables != i) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i, numTables);
+        psError(PS_ERR_BAD_PARAMETER_VALUE, no_problem, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i, numTables);
     }
 
@@ -448 +454 @@
     psFree(tableFormats);
 
-    return true;
+    return no_problem;
 }
 
@@ -698 +704 @@
     if(time->type == PS_TIME_UT1) {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,"Cannot convert from UT1 time type");
-        //        return NULL;
-        return time;
+        return NULL;
     }
 
@@ -724 +729 @@
         } else {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type);
+            return NULL;
         }
         // Convert from TT to TAI, UTC, UT1
@@ -748 +754 @@
         } else {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type);
+            return NULL;
         }
         // Convert from UTC to TAI, TT, UT1
@@ -766 +773 @@
         } else {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, type);
+            return NULL;
         }
         // Convert unknown time type
     } else {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TYPE_UNKNOWN, time->type);
+        return NULL;
     }
 
@@ -1065 +1074 @@
 
         // Date too earlier for tables. Get default polar coodinate values from metadata, and issue warning.
+        #if 0
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES, mjd, "polar motion");
+        return NULL;
+        #else
+
+        psLogMsg(PS_FILE_LINE, PS_LOG_ERROR, PS_ERRORTEXT_psTime_TIME_PREDATES_TABLES, mjd, "polar motion");
+        #endif
 
         tableMetadataItem = psMetadataLookup(timeMetadata, "psLib.time.before.xp");
         if(tableMetadataItem == NULL) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.before.xp");
+            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                    PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "psLib.time.before.xp");
             return NULL;
         }
@@ -1092 +1108 @@
               c = 2*pi*(mjd - pslib.time.predict.mjd)/435.0
         */
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion");
+        #if 0
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion");
+        return NULL;
+        #else
+
+        psLogMsg(PS_FILE_LINE, PS_LOG_ERROR,
+                 PS_ERRORTEXT_psTime_TIME_POSTDATES_TABLES, mjd, "polar motion");
+        #endif
 
         // Get predicted MJD
@@ -1171 +1195 @@
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND,
                 p_psGetConfigFileName());
-        return 0.0;
+        return NAN;
     }
 
@@ -1178 +1202 @@
     if(tableMetadataItem == NULL) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED, "taiTable");
-        return 0.0;
+        return NAN;
     }
     table = (psLookupTable*)tableMetadataItem->data.V;
@@ -1205 +1229 @@
     if(results == NULL) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_INTERPOLATION_FAILED);
+        return NAN;
     }
 
@@ -1347 +1372 @@
     if (!strftime(tempString, MAX_TIME_STRING_LENGTH, "%Y-%m-%dT%H:%M:%S", tmTime)) {
         psError(PS_ERR_OS_CALL_FAILED, true, PS_ERRORTEXT_psTime_CONVERT_TIME_TO_STRING_FAILED);
+        return NULL;
     }
     psFree(tmTime);
@@ -1360 +1386 @@
     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);
+        return NULL;
     }
     psFree(tempString);
@@ -1699 +1726 @@
                    const psTime *time2)
 {
-    psF64 out = 0.0;
     psF64 uSec1 = 0.0;
     psF64 uSec2 = 0.0;
@@ -1714 +1740 @@
     if(time1->type != time2->type) {
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_TYPE_INCORRECT,time1->type);
-        return out;
+        return NAN;
     }
 
@@ -1739 +1765 @@
     uSec2 = tempTime2->sec >= 0 ? 1.0 : -1.0;
     uSec2 = uSec2*tempTime2->nsec/1e9;
-    out = (tempTime1->sec-tempTime2->sec) + (uSec1-uSec2);
+    psF64 out = (tempTime1->sec-tempTime2->sec) + (uSec1-uSec2);
 
     psFree(tempTime1);