Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 2970) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 2971) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-10 02:50:14 $ +* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -465,4 +465,27 @@ } +psF32 psMetadataLookupF32(psMetadata *md, const char *key, psU32 *status) +{ + psF32 value = 0.0; + psElemType pType; + psMetadataItem *metadataItem = NULL; + + + metadataItem = psMetadataLookup(md, key); + if(metadataItem == NULL) { + *status = 1; + return value; + } + + pType = metadataItem->pType; + value = metadataItem->data.F32; + if(pType != PS_TYPE_F32) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_MISMATCH, pType, + PS_TYPE_F32); + } + + return value; +} + psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status) { Index: /trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.h (revision 2970) +++ /trunk/psLib/src/astronomy/psMetadata.h (revision 2971) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-07 23:27:31 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -212,4 +212,18 @@ ); +/** Find an item in the metadata collection based on key name and return its single precision value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psF32 : Value of metadata item. + */ +psF64 psMetadataLookupF32( + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key, ///< Name of metadata key. + psU32 *status ///< Status of lookup. +); + /** Find an item in the metadata collection based on key name and return its integer value. * Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 2970) +++ /trunk/psLib/src/collections/psMetadata.c (revision 2971) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-10 02:50:14 $ +* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -465,4 +465,27 @@ } +psF32 psMetadataLookupF32(psMetadata *md, const char *key, psU32 *status) +{ + psF32 value = 0.0; + psElemType pType; + psMetadataItem *metadataItem = NULL; + + + metadataItem = psMetadataLookup(md, key); + if(metadataItem == NULL) { + *status = 1; + return value; + } + + pType = metadataItem->pType; + value = metadataItem->data.F32; + if(pType != PS_TYPE_F32) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_MISMATCH, pType, + PS_TYPE_F32); + } + + return value; +} + psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status) { Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 2970) +++ /trunk/psLib/src/collections/psMetadata.h (revision 2971) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-07 23:27:31 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -212,4 +212,18 @@ ); +/** Find an item in the metadata collection based on key name and return its single precision value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psF32 : Value of metadata item. + */ +psF64 psMetadataLookupF32( + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key, ///< Name of metadata key. + psU32 *status ///< Status of lookup. +); + /** Find an item in the metadata collection based on key name and return its integer value. * Index: /trunk/psLib/src/dataIO/psFits.c =================================================================== --- /trunk/psLib/src/dataIO/psFits.c (revision 2970) +++ /trunk/psLib/src/dataIO/psFits.c (revision 2971) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 02:08:30 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,4 +25,18 @@ #define MAX_STRING_LENGTH 256 // maximum length string for FITS routines + +static char* standardFitsKeys[] = { + "SIMPLE", + "BITPIX", + "NAXIS", + "NAXIS1", + "NAXIS2", + "NAXIS3", + "EXTEND", + "COMMENT", + "EXTNAME", + "HDUNAME", + NULL + }; static psElemType convertFitsToPsType(int datatype) @@ -457,65 +471,86 @@ psBool tempBool; psBool success; + psBool stdKey; for (int i = 1; i <= numKeys; i++) { fits_read_keyn(fits->p_fd, i, keyName, keyValue, keyComment, &status); - fits_get_keytype(keyValue, &keyType, &status); + + stdKey = false; + + int stdKeyIdx = 0; + while (standardFitsKeys[stdKeyIdx] != NULL && ! stdKey) { + if (strcmp(keyName,standardFitsKeys[stdKeyIdx++]) == 0) { + stdKey = true; + } + } + + if (keyValue[0] != 0) { // blank values are not handled by fits_get_keytype + fits_get_keytype(keyValue, &keyType, &status); + } else { + keyType = 'C'; + } if (status != 0) { break; } - switch (keyType) { - case 'I': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_S32, - PS_META_PRIMITIVE, - keyComment, - atoi(keyValue)); - break; - case 'F': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_F64, - PS_META_PRIMITIVE, - keyComment, - atof(keyValue)); - break; - case 'C': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_U8, - PS_META_STR, - keyComment, - keyValue); - break; - case 'L': - tempBool = (keyValue[0] == 'T') ? 1 : 0; - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_BOOL, - PS_META_PRIMITIVE, - keyComment, - tempBool); - break; - case 'U': - case 'X': - default: - psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_METATYPE_INVALID, - keyType); - return out; - } - - if (!success) { - psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, - keyName); - return out; - } + if (! stdKey) { + switch (keyType) { + case 'X': // bit + case 'I': // short int. + case 'J': // int. + case 'B': // byte + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_S32, + PS_META_PRIMITIVE, + keyComment, + atoi(keyValue)); + break; + case 'U': // unsigned int. may not fit in a psS32 + case 'K': // long int. can't all fit in a psS32 + case 'F': + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_F64, + PS_META_PRIMITIVE, + keyComment, + atof(keyValue)); + break; + case 'C': + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_U8, + PS_META_STR, + keyComment, + keyValue); + break; + case 'L': + tempBool = (keyValue[0] == 'T') ? 1 : 0; + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_BOOL, + PS_META_PRIMITIVE, + keyComment, + tempBool); + break; + default: + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_METATYPE_INVALID, + keyType); + return out; + } + + if (!success) { + psError(PS_ERR_UNKNOWN, false, + PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, + keyName); + return out; + } + } + } Index: /trunk/psLib/src/fileUtils/psFits.c =================================================================== --- /trunk/psLib/src/fileUtils/psFits.c (revision 2970) +++ /trunk/psLib/src/fileUtils/psFits.c (revision 2971) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 02:08:30 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,4 +25,18 @@ #define MAX_STRING_LENGTH 256 // maximum length string for FITS routines + +static char* standardFitsKeys[] = { + "SIMPLE", + "BITPIX", + "NAXIS", + "NAXIS1", + "NAXIS2", + "NAXIS3", + "EXTEND", + "COMMENT", + "EXTNAME", + "HDUNAME", + NULL + }; static psElemType convertFitsToPsType(int datatype) @@ -457,65 +471,86 @@ psBool tempBool; psBool success; + psBool stdKey; for (int i = 1; i <= numKeys; i++) { fits_read_keyn(fits->p_fd, i, keyName, keyValue, keyComment, &status); - fits_get_keytype(keyValue, &keyType, &status); + + stdKey = false; + + int stdKeyIdx = 0; + while (standardFitsKeys[stdKeyIdx] != NULL && ! stdKey) { + if (strcmp(keyName,standardFitsKeys[stdKeyIdx++]) == 0) { + stdKey = true; + } + } + + if (keyValue[0] != 0) { // blank values are not handled by fits_get_keytype + fits_get_keytype(keyValue, &keyType, &status); + } else { + keyType = 'C'; + } if (status != 0) { break; } - switch (keyType) { - case 'I': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_S32, - PS_META_PRIMITIVE, - keyComment, - atoi(keyValue)); - break; - case 'F': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_F64, - PS_META_PRIMITIVE, - keyComment, - atof(keyValue)); - break; - case 'C': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_U8, - PS_META_STR, - keyComment, - keyValue); - break; - case 'L': - tempBool = (keyValue[0] == 'T') ? 1 : 0; - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_BOOL, - PS_META_PRIMITIVE, - keyComment, - tempBool); - break; - case 'U': - case 'X': - default: - psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_METATYPE_INVALID, - keyType); - return out; - } - - if (!success) { - psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, - keyName); - return out; - } + if (! stdKey) { + switch (keyType) { + case 'X': // bit + case 'I': // short int. + case 'J': // int. + case 'B': // byte + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_S32, + PS_META_PRIMITIVE, + keyComment, + atoi(keyValue)); + break; + case 'U': // unsigned int. may not fit in a psS32 + case 'K': // long int. can't all fit in a psS32 + case 'F': + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_F64, + PS_META_PRIMITIVE, + keyComment, + atof(keyValue)); + break; + case 'C': + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_U8, + PS_META_STR, + keyComment, + keyValue); + break; + case 'L': + tempBool = (keyValue[0] == 'T') ? 1 : 0; + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_BOOL, + PS_META_PRIMITIVE, + keyComment, + tempBool); + break; + default: + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_METATYPE_INVALID, + keyType); + return out; + } + + if (!success) { + psError(PS_ERR_UNKNOWN, false, + PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, + keyName); + return out; + } + } + } Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 2970) +++ /trunk/psLib/src/fits/psFits.c (revision 2971) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 02:08:30 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -25,4 +25,18 @@ #define MAX_STRING_LENGTH 256 // maximum length string for FITS routines + +static char* standardFitsKeys[] = { + "SIMPLE", + "BITPIX", + "NAXIS", + "NAXIS1", + "NAXIS2", + "NAXIS3", + "EXTEND", + "COMMENT", + "EXTNAME", + "HDUNAME", + NULL + }; static psElemType convertFitsToPsType(int datatype) @@ -457,65 +471,86 @@ psBool tempBool; psBool success; + psBool stdKey; for (int i = 1; i <= numKeys; i++) { fits_read_keyn(fits->p_fd, i, keyName, keyValue, keyComment, &status); - fits_get_keytype(keyValue, &keyType, &status); + + stdKey = false; + + int stdKeyIdx = 0; + while (standardFitsKeys[stdKeyIdx] != NULL && ! stdKey) { + if (strcmp(keyName,standardFitsKeys[stdKeyIdx++]) == 0) { + stdKey = true; + } + } + + if (keyValue[0] != 0) { // blank values are not handled by fits_get_keytype + fits_get_keytype(keyValue, &keyType, &status); + } else { + keyType = 'C'; + } if (status != 0) { break; } - switch (keyType) { - case 'I': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_S32, - PS_META_PRIMITIVE, - keyComment, - atoi(keyValue)); - break; - case 'F': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_F64, - PS_META_PRIMITIVE, - keyComment, - atof(keyValue)); - break; - case 'C': - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_U8, - PS_META_STR, - keyComment, - keyValue); - break; - case 'L': - tempBool = (keyValue[0] == 'T') ? 1 : 0; - success = psMetadataAdd(out, - PS_LIST_TAIL, - keyName, - PS_TYPE_BOOL, - PS_META_PRIMITIVE, - keyComment, - tempBool); - break; - case 'U': - case 'X': - default: - psError(PS_ERR_IO, true, - PS_ERRORTEXT_psFits_METATYPE_INVALID, - keyType); - return out; - } - - if (!success) { - psError(PS_ERR_UNKNOWN, false, - PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, - keyName); - return out; - } + if (! stdKey) { + switch (keyType) { + case 'X': // bit + case 'I': // short int. + case 'J': // int. + case 'B': // byte + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_S32, + PS_META_PRIMITIVE, + keyComment, + atoi(keyValue)); + break; + case 'U': // unsigned int. may not fit in a psS32 + case 'K': // long int. can't all fit in a psS32 + case 'F': + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_F64, + PS_META_PRIMITIVE, + keyComment, + atof(keyValue)); + break; + case 'C': + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_U8, + PS_META_STR, + keyComment, + keyValue); + break; + case 'L': + tempBool = (keyValue[0] == 'T') ? 1 : 0; + success = psMetadataAdd(out, + PS_LIST_TAIL, + keyName, + PS_TYPE_BOOL, + PS_META_PRIMITIVE, + keyComment, + tempBool); + break; + default: + psError(PS_ERR_IO, true, + PS_ERRORTEXT_psFits_METATYPE_INVALID, + keyType); + return out; + } + + if (!success) { + psError(PS_ERR_UNKNOWN, false, + PS_ERRORTEXT_psFits_METADATA_ADD_FAILED, + keyName); + return out; + } + } + } Index: /trunk/psLib/src/sys/psError.c =================================================================== --- /trunk/psLib/src/sys/psError.c (revision 2970) +++ /trunk/psLib/src/sys/psError.c (revision 2971) @@ -9,7 +9,7 @@ * * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-04 01:05:00 $ + * + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-13 19:50:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -129,4 +129,9 @@ } +psS32 psErrorGetStackSize() +{ + return errorStackSize; +} + psErr* psErrorLast(void) { Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 2970) +++ /trunk/psLib/src/types/psMetadata.c (revision 2971) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-10 02:50:14 $ +* @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -465,4 +465,27 @@ } +psF32 psMetadataLookupF32(psMetadata *md, const char *key, psU32 *status) +{ + psF32 value = 0.0; + psElemType pType; + psMetadataItem *metadataItem = NULL; + + + metadataItem = psMetadataLookup(md, key); + if(metadataItem == NULL) { + *status = 1; + return value; + } + + pType = metadataItem->pType; + value = metadataItem->data.F32; + if(pType != PS_TYPE_F32) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_MISMATCH, pType, + PS_TYPE_F32); + } + + return value; +} + psF64 psMetadataLookupF64(psMetadata *md, const char *key, psU32 *status) { Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 2970) +++ /trunk/psLib/src/types/psMetadata.h (revision 2971) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-07 23:27:31 $ +* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-13 19:50:44 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -212,4 +212,18 @@ ); +/** Find an item in the metadata collection based on key name and return its single precision value. + * + * Items may be found in the metadata by providing a key. If the key is + * non-unique, the value of the first item is returned. If the item is not found, zero is + * returned. + * + * @return psF32 : Value of metadata item. + */ +psF64 psMetadataLookupF32( + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key, ///< Name of metadata key. + psU32 *status ///< Status of lookup. +); + /** Find an item in the metadata collection based on key name and return its integer value. *