Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 1380) +++ trunk/psLib/src/collections/psMetadata.h (revision 1382) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 20:59:41 $ +* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-04 22:11:09 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -18,4 +18,10 @@ #define PS_METADATA_H +#include +#include +#include + +#include "psHash.h" +#include "psList.h" /// @addtogroup Metadata @@ -33,15 +39,15 @@ */ typedef enum { - PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items - PS_META_BOOL, ///< Boolean data. - PS_META_S32, ///< Signed 32-bit integer data. - PS_META_F32, ///< Single-precision float data. - PS_META_F64, ///< Double-precision float data. - PS_META_STR, ///< String data (Stored in as void *). - PS_META_IMG, ///< Image data (Stored in as void *). - PS_META_JPEG, ///< JPEG data (Stored in as void . - PS_META_PNG, ///< PNG data (Stored in as void *). - PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). - PS_META_UNKNOWN, ///< Other data (Stored in as void *). + PS_META_ITEM_SET = 0, ///< Null. Metadata is in psMetadataItem.items + PS_META_BOOL, ///< Boolean data. + PS_META_S32, ///< Signed 32-bit integer data. + PS_META_F32, ///< Single-precision float data. + PS_META_F64, ///< Double-precision float data. + PS_META_STR, ///< String data (Stored in as void *). + PS_META_IMG, ///< Image data (Stored in as void *). + PS_META_JPEG, ///< JPEG data (Stored in as void . + PS_META_PNG, ///< PNG data (Stored in as void *). + PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). + PS_META_UNKNOWN, ///< Other data (Stored in as void *). PS_META_NTYPE ///< Number of types. Must be last. } psMetadataType; @@ -78,6 +84,6 @@ typedef struct psMetadata { - psList *restrict list; - psHash *restrict table; + psList* restrict list; + psHash* restrict table; } psMetadata; @@ -102,7 +108,7 @@ */ psMetadataItem *psMetadataItemAlloc( - const char *name, ///< Name of metadata item. - psMetadataType type, ///< Type of metadata item. - const char *comment, ///< Comment for metadata item. + const char *name, ///< Name of metadata item. + psMetadataType type, ///< Type of metadata item. + const char *comment, ///< Comment for metadata item. ... ///< Arguments for name formatting and metadata item data. ); @@ -122,7 +128,7 @@ */ psMetadataItem *psMetadataItemAllocV( - const char *name, ///< Name of metadata item. - psMetadataType type, ///< Type of metadata item. - const char *comment, ///< Comment for metadata item. + const char *name, ///< Name of metadata item. + psMetadataType type, ///< Type of metadata item. + const char *comment, ///< Comment for metadata item. va_list list ///< Arguments for name formatting and metadata item data. ); @@ -145,6 +151,6 @@ */ bool psMetadataAddItem( - psMetadata *restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be added. + psMetadata *restrict md, ///< Metadata collection to insert metadat item. + int where, ///< Location to be added. psMetadataItem *restrict item ///< Metadata item to be added. ); @@ -157,9 +163,9 @@ */ bool psMetadataAdd( - psMetadata *restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be added. - const char *name, ///< Name of metadata item. - psMetadataType type, ///< Type of metadata item. - const char *comment, ///< Comment for metadata item. + psMetadata *restrict md, ///< Metadata collection to insert metadat item. + int where, ///< Location to be added. + const char *name, ///< Name of metadata item. + psMetadataType type, ///< Type of metadata item. + const char *comment, ///< Comment for metadata item. ... ///< Arguments for name formatting and metadata item data. ); @@ -175,6 +181,6 @@ */ bool psMetadataRemove( - psMetadata *restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be removed. + psMetadata *restrict md, ///< Metadata collection to insert metadat item. + int where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. ); @@ -188,5 +194,5 @@ */ psMetadataItem *psMetadataLookup( - psMetadata *restrict md, ///< Metadata collection to insert metadat item. + psMetadata *restrict md, ///< Metadata collection to insert metadat item. const char *restrict key ///< Name of metadata key. ); @@ -199,5 +205,5 @@ */ psMetadataItem *psMetadataGet( - psMetadata *restrict md, ///< Metadata collection to insert metadat item. + psMetadata *restrict md, ///< Metadata collection to insert metadat item. int where ///< Location to be retrieved. ); @@ -210,5 +216,5 @@ */ bool psMetadataSetIterator( - psMetadata *restrict md, ///< Metadata collection to iterate. + psMetadata *restrict md, ///< Metadata collection to iterate. int where ///< Location of iterator. ); @@ -221,6 +227,6 @@ */ psMetadataItem *psMetadataGetNext( - psMetadata *restrict md, ///< Metadata collection to iterate. - const char *restrict match, ///< Beginning of key name. + psMetadata *restrict md, ///< Metadata collection to iterate. + const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. ); @@ -233,6 +239,6 @@ */ psMetadataItem *psMetadataGetPrevious( - psMetadata *restrict md, ///< Metadata collection to iterate. - const char *restrict match, ///< Beginning of key name. + psMetadata *restrict md, ///< Metadata collection to iterate. + const char *restrict match, ///< Beginning of key name. int which ///< Iterator to be used. ); @@ -249,6 +255,6 @@ */ void psMetadataItemPrint( - FILE *fd, ///< Pointer to file to write metadata item. - const char *format, ///< Format to print metadata item. + FILE *fd, ///< Pointer to file to write metadata item. + const char *format, ///< Format to print metadata item. const psMetadataItem *restrict metadataItem ///< Metadata item to print. ); @@ -261,7 +267,7 @@ */ psMetadata *psMetadataReadHeader( - psMetadata *output, ///< Resulting metadata from read. - const char *extname, ///< File name extension string. - int extnum, ///< File name extension number. + psMetadata *output, ///< Resulting metadata from read. + const char *extname, ///< File name extension string. + int extnum, ///< File name extension number. const char *filename ///< Name of file to read. ); @@ -274,8 +280,8 @@ */ psMetadata *psMetadataFReadHeader( - psMetadata *output, ///< Resulting metadata from read. - const char *extname, ///< File name extension string. - int extnum, ///< File name extension number. - fitsfile *fd ///< Pointer to file to read. + psMetadata *output, ///< Resulting metadata from read. + const char *extname, ///< File name extension string. + int extnum, ///< File name extension number. + fitsfile *fd ///< Pointer to file to read. ); /// @}