Changeset 2657 for trunk/psLib/src/astronomy

Timestamp:

Dec 7, 2004, 12:59:11 PM (22 years ago)

Author:

harman

Message:

Updated new functions in SDRS 10 per latest polycon

Location:

trunk/psLib/src/astronomy

Files:

• psMetadata.c (modified) (7 diffs)
• psMetadata.h (modified) (4 diffs)

trunk/psLib/src/astronomy/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 19:09:05 $
+*  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 22:58:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -437 +437 @@
 }
 
-void* psMetadataLookupPtr(psMetadata *md, const char *key)
+void* psMetadataLookupPtr(psMetadata *md, const char *key, psU32 *status)
 {
     void *value = NULL;
@@ -445 +445 @@
 
     metadataItem = psMetadataLookup(md, key);
-    PS_PTR_CHECK_NULL(metadataItem,NULL);
+    if(metadataItem == NULL) {
+        *status = 1;
+        return value;
+    }
+
     pType = metadataItem->pType;
     value = metadataItem->data.V;
@@ -456 +460 @@
 }
 
-psS32 psMetadataLookupS32(psMetadata *md, const char *key)
+psS32 psMetadataLookupS32(psMetadata *md, const char *key, psU32 *status)
 {
     psS32 value = 0;
@@ -464 +468 @@
 
     metadataItem = psMetadataLookup(md, key);
-    PS_PTR_CHECK_NULL(metadataItem,0);
+    if(metadataItem == NULL) {
+        *status = 1;
+        return value;
+    }
+
     pType = metadataItem->pType;
     value = metadataItem->data.S32;
@@ -475 +483 @@
 }
 
-psF64 psMetadataLookupF64(psMetadata *md, const char *key)
+psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status)
 {
     psF64 value = 0.0;
@@ -483 +491 @@
 
     metadataItem = psMetadataLookup(md, key);
-    PS_PTR_CHECK_NULL(metadataItem,0.0);
+    if(metadataItem == NULL) {
+        *status = 1;
+        return value;
+    }
+
     pType = metadataItem->pType;
     value = metadataItem->data.F64;

trunk/psLib/src/astronomy/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-07 19:08:58 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-07 22:59:05 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -208 +208 @@
 psF64 psMetadataLookupF64(
     psMetadata *md,            ///< Metadata collection to lookup metadata item.
-    const char *key            ///< Name of metadata key.
+    const char *key,           ///< Name of metadata key.
+    psU32 *status              ///< Status of lookup.
 );
 
@@ -221 +222 @@
 psS32 psMetadataLookupS32(
     psMetadata *md,            ///< Metadata collection to lookup metadata item.
-    const char *key            ///< Name of metadata key.
+    const char *key,           ///< Name of metadata key.
+    psU32 *status              ///< Status of lookup.
 );
 
@@ -234 +236 @@
 void* psMetadataLookupPtr(
     psMetadata* md,            ///< Metadata collection to lookup metadata item.
-    const char *key            ///< Name of metadata key.
+    const char *key,           ///< Name of metadata key.
+    psU32 *status              ///< Status of lookup.
 );