Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 5453) +++ /trunk/psLib/src/sys/psType.h (revision 5454) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-26 21:13:25 $ +* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-10-29 00:05:52 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,6 +105,4 @@ PS_DATA_ARRAY, ///< psArray PS_DATA_BITSET, ///< psBitSet - PS_DATA_CELL, ///< psCell - PS_DATA_CHIP, ///< psChip PS_DATA_CUBE, ///< psCube PS_DATA_FITS, ///< psFits @@ -127,6 +125,4 @@ PS_DATA_POLYNOMIAL4D, ///< psPolynomial4D PS_DATA_PROJECTION, ///< psProjection - PS_DATA_READOUT, ///< psReadout - PS_DATA_REGION, ///< psRegion PS_DATA_SCALAR, ///< psScalar PS_DATA_SPHERE, ///< psSphere Index: /trunk/psLib/src/types/psArray.h =================================================================== --- /trunk/psLib/src/types/psArray.h (revision 5453) +++ /trunk/psLib/src/types/psArray.h (revision 5454) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-01 02:22:15 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-10-29 00:05:53 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -116,5 +116,5 @@ */ void psArrayElementsFree( - psArray* psArr ///< Void pointer array to destroy. + psArray* array ///< Void pointer array to destroy. ); Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 5453) +++ /trunk/psLib/src/types/psMetadata.c (revision 5454) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.87 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-30 01:34:45 $ + * @version $Revision: 1.88 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-10-29 00:05:53 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -248,6 +248,4 @@ case PS_DATA_ARRAY: ///< psArray case PS_DATA_BITSET: ///< psBitSet - case PS_DATA_CELL: ///< psCell - case PS_DATA_CHIP: ///< psChip case PS_DATA_CUBE: ///< psCube case PS_DATA_FITS: ///< psFits @@ -270,6 +268,4 @@ case PS_DATA_POLYNOMIAL4D: ///< psPolynomial4D case PS_DATA_PROJECTION: ///< psProjection - case PS_DATA_READOUT: ///< psReadout - case PS_DATA_REGION: ///< psRegion case PS_DATA_SCALAR: ///< psScalar case PS_DATA_SPHERE: ///< psSphere @@ -867,10 +863,11 @@ -char *psMetadataLookupStr(bool *status, - const psMetadata *md, - const char *key) +psString psMetadataLookupStr(bool *status, + const psMetadata *md, + const char *key) { psMetadataItem *item = psMetadataLookup((psMetadata*)md, key); // The metadata with instruments - char *value = NULL; // The value to return + // char *value = NULL; // The value to return + psString value = NULL; if (!item) { // The given key isn't in the metadata @@ -893,5 +890,6 @@ *status = true; } - value = item->data.V; // The requested metadata + // value = item->data.V; // The requested metadata + value = psStringNCopy(item->data.V, strlen(item->data.V) ); } return value; Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 5453) +++ /trunk/psLib/src/types/psMetadata.h (revision 5454) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-30 01:34:45 $ +* @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-10-29 00:05:53 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -490,5 +490,5 @@ * @return bool: True for success, False for failure. */ -psBool psMetadataAddPtr( +bool psMetadataAddPtr( psMetadata* md, ///< Metadata collection to insert metadata item long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -711,5 +711,5 @@ * @return char*: Value of metadata item. */ -char *psMetadataLookupStr( +psString psMetadataLookupStr( bool *status, ///< Status of lookup. const psMetadata *md, ///< Metadata collection to lookup metadata item. Index: /trunk/psLib/test/types/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_04.c (revision 5453) +++ /trunk/psLib/test/types/tst_psMetadata_04.c (revision 5454) @@ -25,6 +25,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-26 21:13:33 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-10-29 00:05:53 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -223,5 +223,5 @@ // Test K - Lookup metadata item and return psString value printPositiveTestHeader(stdout, "psMetadata", "Test K - Lookup metadata item and return psString value"); - char *newSTR; + psString newSTR; newSTR = psMetadataLookupStr(&status, metadata, "myItem8"); if( strncmp(newSTR, string, 50) ) { @@ -307,5 +307,5 @@ // Test Q - Free psMetadata printPositiveTestHeader(stdout, "psMetadata", "Test Q - Free psMetadata"); - // psFree(newSTR); + psFree(newSTR); // psFree(string); psFree(newMD); Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout (revision 5453) +++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout (revision 5454) @@ -44,9 +44,9 @@ Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 Key Name: XTENSION Key mdType: 0x00010000 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: BITPIX Key mdType: 0x00010023 Key Value: Key Comment: + Key Name: BITPIX Key mdType: 0x0001001f Key Value: Key Comment: Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: HISTORY Key mdType: 0x00010023 Key Value: Key Comment: + Key Name: HISTORY Key mdType: 0x0001001f Key Value: Key Comment: Key Name: HISTORY Key mdType: 0x00010000 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T Key Name: HISTORY Key mdType: 0x00010000 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T @@ -81,5 +81,5 @@ Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: HISTORY Key mdType: 0x00010023 Key Value: Key Comment: + Key Name: HISTORY Key mdType: 0x0001001f Key Value: Key Comment: Key Name: HISTORY Key mdType: 0x00010000 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T Key Name: HISTORY Key mdType: 0x00010000 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T Index: /trunk/psLib/test/types/verified/tst_psMetadata_06.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_06.stdout (revision 5453) +++ /trunk/psLib/test/types/verified/tst_psMetadata_06.stdout (revision 5454) @@ -9,5 +9,5 @@ Key Name: myItem1 Key mdType: 0x00000104 Key Value: 222 Key Comment: I am a signed integer Key Name: myItem2 Key mdType: 0x00000104 Key Value: 333 Key Comment: I am a signed integer -Key Name: myItem2 Key mdType: 0x0001000b Key Value: psList Key Comment: I am a list +Key Name: myItem2 Key mdType: 0x00010009 Key Value: psList Key Comment: I am a list ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata and items} | tst_psMetadata_06.c)