Changeset 2607 for trunk/psLib/src/astronomy/psTime.c

Timestamp:

Dec 3, 2004, 1:19:07 PM (22 years ago)

Author:

harman

Message:

Updates for version 10 of SDRS

File:

• trunk/psLib/src/astronomy/psTime.c (modified) (4 diffs)

trunk/psLib/src/astronomy/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-29 18:41:07 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-12-03 23:15:00 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -196 +196 @@
     psS32 j = 0;
     psS32 numTables = 0;
+    psU32 nFail = 0;
     psVector *tablesFrom = NULL;
     psVector *tablesTo = NULL;
@@ -205 +206 @@
 
     // Read time config file
-    if(psMetadataParseConfig(&timeMetadata, fileName, true) < 0) {
+    timeMetadata = psMetadataParseConfig(timeMetadata, &nFail, fileName, true);
+    if(timeMetadata == NULL) {
+        return false;
+    } else if(nFail != 0) {
         return false;
     }
@@ -298 +302 @@
             if(metadataNamesPtr != NULL) {
                 psMetadataAdd(timeMetadata, PS_LIST_TAIL, strcat(metadataTableNames[j], "Table"),
-                              PS_META_LOOKUPTABLE, NULL, table);
+                              PS_TYPE_PTR, PS_META_LOOKUPTABLE, NULL, table);
                 foundTable = true;
             } else if(foundTable==false && j==numTables-1) {