Index: /trunk/psLib/src/astro/psTime.c =================================================================== --- /trunk/psLib/src/astro/psTime.c (revision 5135) +++ /trunk/psLib/src/astro/psTime.c (revision 5136) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.71 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-21 02:11:16 $ + * @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -397,5 +397,5 @@ if(metadataNamesPtr != NULL) { psMetadataAdd(timeMetadata, PS_LIST_TAIL, strcat(metadataTableNames[j], "Table"), - PS_META_LOOKUPTABLE, NULL, table); + PS_DATA_LOOKUPTABLE, NULL, table); foundTable = true; } else if(foundTable==false && j==numTables-1) { Index: /trunk/psLib/src/db/psDB.c =================================================================== --- /trunk/psLib/src/db/psDB.c (revision 5135) +++ /trunk/psLib/src/db/psDB.c (revision 5136) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-27 01:33:40 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:16 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -501,13 +501,13 @@ // copy field data and convert NULLs to the appropriate NaN value - if (pType == PS_META_STR) { + if (pType == PS_DATA_STRING) { psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, 0, "", data); - } else if (pType == PS_META_S32) { + } else if (pType == PS_DATA_S32) { psMetadataAddS32(md, PS_LIST_TAIL, field[i].name, 0, "", atoll(data)); - } else if (pType == PS_META_F32) { + } else if (pType == PS_DATA_F32) { psMetadataAddF32(md, PS_LIST_TAIL, field[i].name, 0, "", atof(data)); - } else if (pType == PS_META_F64) { + } else if (pType == PS_DATA_F64) { psMetadataAddF64(md, PS_LIST_TAIL, field[i].name, 0, "", atof(data)); - } else if (pType == PS_META_BOOL) { + } else if (pType == PS_DATA_BOOL) { psMetadataAdd(md, PS_LIST_TAIL, field[i].name, pType, "", atoi(data)); } else { @@ -710,6 +710,6 @@ // column as an psArray of strings; otherwise fetch the column as a // psVector. - if (pType == PS_META_STR) { - // PS_META_UNKNOWN -> PS_META_ARRAY ? + if (pType == PS_DATA_STRING) { + // PS_DATA_UNKNOWN -> PS_DATA_ARRAY ? column = psDBSelectColumn(dbh, tableName, field[i].name, 0); psMetadataAddArray(table, PS_LIST_TAIL, field[i].name, 0, "", column); @@ -946,5 +946,5 @@ ? (my_bool *)&isNull : NULL; - } else if (item->type == PS_META_STR) { + } else if (item->type == PS_DATA_STRING) { // convert NaNs to NULL and set the buffer_length for strings @@ -957,8 +957,8 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE , true, - "FIXME: Only type of PS_TYPE_S32 (PS_META_S32), " - "PS_TYPE_F32 (PS_META_F32), PS_TYPE_F64 (PS_META_F64), " - "PS_TYPE_BOOL (PS_META_BOOL), " - "and PS_META_STR are supported."); + "FIXME: Only type of PS_TYPE_S32 (PS_DATA_S32), " + "PS_TYPE_F32 (PS_DATA_F32), PS_TYPE_F64 (PS_DATA_F64), " + "PS_TYPE_BOOL (PS_DATA_BOOL), " + "and PS_DATA_STRING are supported."); psFree(cursor); @@ -1002,18 +1002,18 @@ // find column name and type while ((item = psListGetAndIncrement(cursor))) { - if ((item->type == PS_META_S32) || (item->type == PS_META_F32) || (item->type == PS_META_F64) || + if ((item->type == PS_DATA_S32) || (item->type == PS_DATA_F32) || (item->type == PS_DATA_F64) || (item->type == PS_TYPE_S32) || (item->type == PS_TYPE_F32) || (item->type == PS_TYPE_F64) || - (item->type == PS_TYPE_BOOL) || (item->type == PS_META_BOOL)) { + (item->type == PS_TYPE_BOOL) || (item->type == PS_DATA_BOOL)) { // + column name + _ + column type colType = psDBPTypeToSQL(item->type); psStringAppend(&query, "%s %s", item->name, colType); psFree(colType); - } else if (item->type == PS_META_STR) { + } else if (item->type == PS_DATA_STRING) { // + column name + _ + varchar( + length + ) psStringAppend(&query, "%s VARCHAR(%s)", item->name, item->data.V); } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - "FIXME: Only type of PS_META_S32, PS_META_F32, PS_META_F64, PS_META_BOOL, " - "and PS_META_STR are supported, (not %d).", item->type); + "FIXME: Only type of PS_DATA_S32, PS_DATA_F32, PS_DATA_F64, PS_DATA_BOOL, " + "and PS_DATA_STRING are supported, (not %d).", item->type); psFree(query); @@ -1243,13 +1243,13 @@ while ((item = psListGetAndIncrement(cursor))) { // item->data must be a string - if ((item->type == PS_META_S32) || (item->type == PS_TYPE_S32)) { + if ((item->type == PS_DATA_S32) || (item->type == PS_TYPE_S32)) { psStringAppend(&query, "%s=%d", item->name, (int)(item->data.S32)); - } else if ((item->type == PS_META_F32) || (item->type == PS_TYPE_F32)) { + } else if ((item->type == PS_DATA_F32) || (item->type == PS_TYPE_F32)) { psStringAppend(&query, "%s=%g", item->name, (double)(item->data.F32)); - } else if ((item->type == PS_META_F64) || (item->type == PS_TYPE_F64)) { + } else if ((item->type == PS_DATA_F64) || (item->type == PS_TYPE_F64)) { psStringAppend(&query, "%s=%g", item->name, (double)(item->data.F64)); - } else if ((item->type == PS_META_BOOL) || (item->type == PS_TYPE_BOOL)) { + } else if ((item->type == PS_DATA_BOOL) || (item->type == PS_TYPE_BOOL)) { psStringAppend(&query, "%s=%d", item->name, (int)(item->data.B)); - } else if (item->type == PS_META_STR) { + } else if (item->type == PS_DATA_STRING) { // + column name + _ + like + _ + ' + value + ' if (*(char *)item->data.V == '\0') { @@ -1264,5 +1264,5 @@ } else { psError(PS_ERR_BAD_PARAMETER_TYPE, true, - "Only types PS_META_S32, PS_META_F32, PS_META_F64, PS_META_BOOL, PS_META_STR are supported"); + "Only types PS_DATA_S32, PS_DATA_F32, PS_DATA_F64, PS_DATA_BOOL, PS_DATA_STRING are supported"); psFree(cursor); @@ -1440,5 +1440,5 @@ psDBAddToLookupTable(lookupTable, PS_TYPE_C64, "PS_TYPE_C64 is not supported"); psDBAddToLookupTable(lookupTable, PS_TYPE_BOOL,"TINYINT"); - psDBAddToLookupTable(lookupTable, PS_META_STR, "VARCHAR"); + psDBAddToLookupTable(lookupTable, PS_DATA_STRING, "VARCHAR"); } @@ -1483,5 +1483,5 @@ // Add BLOB & TEXT reverse mappings - value = psDBIntToString((psU64)PS_META_STR); + value = psDBIntToString((psU64)PS_DATA_STRING); psHashAdd(lookupTable, "BLOB", value); psHashAdd(lookupTable, "TEXT", value); @@ -1584,14 +1584,14 @@ // psDBAddVoidToLookupTable(lookupTable, PS_TYPE_PTR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_STR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_VEC, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_IMG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_HASH, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_LOOKUPTABLE, + psDBAddVoidToLookupTable(lookupTable, PS_DATA_STRING, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + psDBAddVoidToLookupTable(lookupTable, PS_DATA_VECTOR, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + psDBAddVoidToLookupTable(lookupTable, PS_DATA_IMAGE, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + psDBAddVoidToLookupTable(lookupTable, PS_DATA_HASH, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + psDBAddVoidToLookupTable(lookupTable, PS_DATA_LOOKUPTABLE, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_JPEG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_PNG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_ASTROM, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); - psDBAddVoidToLookupTable(lookupTable, PS_META_UNKNOWN,psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + // psDBAddVoidToLookupTable(lookupTable, PS_DATA_JPEG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + // psDBAddVoidToLookupTable(lookupTable, PS_DATA_PNG, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + // psDBAddVoidToLookupTable(lookupTable, PS_DATA_ASTROM, psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); + psDBAddVoidToLookupTable(lookupTable, PS_DATA_UNKNOWN,psDBMySQLTypeAlloc(MYSQL_TYPE_VAR_STRING, false)); } Index: /trunk/psLib/src/db/psDB.h =================================================================== --- /trunk/psLib/src/db/psDB.h (revision 5135) +++ /trunk/psLib/src/db/psDB.h (revision 5136) @@ -10,6 +10,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-26 20:00:57 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:16 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -104,9 +104,9 @@ * type is give by the psMetadataItem.type and psMetadataItem.ptype entries. A * lookup table should be used to convert from PSLib types into MySQL - * compatible SQL data types. For example, a PS_META_STR would map to an SQL99 - * varchar. If the value of type is PS_META_STR then the psMetadataItem.data + * compatible SQL data types. For example, a PS_DATA_STRING would map to an SQL99 + * varchar. If the value of type is PS_DATA_STRING then the psMetadataItem.data * element is set to a string with the length for the field written as a text * string. The value of the psMetadataItem.data element is unused for the - * PS_META_PRIMITIVE types. Other psMetadata types beyond PS_META_STR and + * PS_META_PRIMITIVE types. Other psMetadata types beyond PS_DATA_STRING and * PS_META_PRIMITIVE are not allowed in a table definition. * @@ -170,5 +170,5 @@ * values, one per row. * - * Currently, the "where" specification only supports the PS_META_STR type. + * Currently, the "where" specification only supports the PS_DATA_STRING type. * The string value can be a SQL match pattern, e.g. "%foo%", or an empty * string, e.g. "", to match NULL field values. @@ -189,5 +189,5 @@ * The "row" specification uses the psMetadataItem name as the column name. * The field values may be specified in any order. psMetadata types beyond - * PS_META_STR and PS_META_PRIMITIVE are not supported. If fields are + * PS_DATA_STRING and PS_META_PRIMITIVE are not supported. If fields are * specified in "row" that do not exist in "tableName", the insert will fail. * Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 5135) +++ /trunk/psLib/src/fits/psFits.c (revision 5136) @@ -1,3 +1,3 @@ -/** @file psFits.c +/** @file psFits.cr * * @brief Contains Fits I/O routines @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-22 23:19:38 $ + * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:22 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -156,20 +156,20 @@ } -static bool convertMetadataTypeToBinaryTForm(psMetadataType type, char** fitsType) +static bool convertMetadataTypeToBinaryTForm(psDataType type, char** fitsType) { switch (type) { - case PS_META_BOOL: + case PS_DATA_BOOL: *fitsType = psStringCopy("1L"); break; - case PS_META_S32: + case PS_DATA_S32: *fitsType = psStringCopy("1J"); break; - case PS_META_F32: + case PS_DATA_F32: *fitsType = psStringCopy("1E"); break; - case PS_META_F64: + case PS_DATA_F64: *fitsType = psStringCopy("1D"); break; - case PS_META_STR: + case PS_DATA_STRING: *fitsType = psStringCopy("1A"); break; @@ -510,5 +510,5 @@ PS_LIST_TAIL, keyName, - PS_META_S32 | PS_META_DUPLICATE_OK, + PS_DATA_S32 | PS_META_DUPLICATE_OK, keyComment, atoi(keyValue)); @@ -520,5 +520,5 @@ PS_LIST_TAIL, keyName, - PS_META_F64 | PS_META_DUPLICATE_OK, + PS_DATA_F64 | PS_META_DUPLICATE_OK, keyComment, atof(keyValue)); @@ -531,5 +531,5 @@ PS_LIST_TAIL, keyName, - PS_META_STR | PS_META_DUPLICATE_OK, + PS_DATA_STRING | PS_META_DUPLICATE_OK, keyComment, keyValue+1); @@ -538,5 +538,5 @@ PS_LIST_TAIL, keyName, - PS_META_STR | PS_META_DUPLICATE_OK, + PS_DATA_STRING | PS_META_DUPLICATE_OK, keyComment, keyValue); @@ -548,5 +548,5 @@ PS_LIST_TAIL, keyName, - PS_META_BOOL | PS_META_DUPLICATE_OK, + PS_DATA_BOOL | PS_META_DUPLICATE_OK, keyComment, tempBool); @@ -1053,5 +1053,5 @@ while ( (item=psListGetAndIncrement(iter)) != NULL ) { switch (item->type) { - case PS_META_BOOL: { + case PS_DATA_BOOL: { int value = item->data.B; fits_update_key(fits->fd, @@ -1063,5 +1063,5 @@ break; } - case PS_META_S32: + case PS_DATA_S32: fits_update_key(fits->fd, TINT, @@ -1071,5 +1071,5 @@ &status); break; - case PS_META_F32: + case PS_DATA_F32: fits_update_key(fits->fd, TFLOAT, @@ -1079,5 +1079,5 @@ &status); break; - case PS_META_F64: + case PS_DATA_F64: fits_update_key(fits->fd, TDOUBLE, @@ -1087,5 +1087,5 @@ &status); break; - case PS_META_STR: + case PS_DATA_STRING: fits_update_key(fits->fd, TSTRING, @@ -1192,5 +1192,5 @@ col, name, typecode, repeat, (double)value); \ psMetadataAdd(data,PS_LIST_TAIL, name, \ - PS_META_##TYPE, \ + PS_DATA_##TYPE, \ "", (ps##TYPE)value); \ break; \ @@ -1214,5 +1214,5 @@ if (anynul == 0) { psMetadataAdd(data,PS_LIST_TAIL, name, - PS_META_STR, + PS_DATA_STRING, "", value); } @@ -1494,5 +1494,5 @@ PS_LIST_HEAD,true); while ( (item=psListGetAndIncrement(iter)) != NULL) { - if (PS_META_IS_PRIMITIVE(item->type) || item->type == PS_META_STR) { + if (PS_DATA_IS_PRIMITIVE(item->type) || item->type == PS_DATA_STRING) { bool found = false; psMetadataItem* fItem = NULL; @@ -1506,5 +1506,5 @@ if (! found) { psArrayAdd(columns, columns->nalloc, item); - } else if (item->type == PS_META_STR && + } else if (item->type == PS_DATA_STRING && strlen(fItem->data.V) > strlen(item->data.V)) { // got to keep the longest string value as to know what size to create the table column @@ -1567,9 +1567,9 @@ int row; item = columns->data[n]; - if (PS_META_IS_PRIMITIVE(item->type)) { + if (PS_DATA_IS_PRIMITIVE(item->type)) { psVector* col = NULL; psArray* colArray = NULL; switch (item->type) { - case PS_META_S32: + case PS_DATA_S32: col = psVectorAlloc(table->n, PS_TYPE_S32); for (row = 0; row < table->n; row++) { @@ -1587,5 +1587,5 @@ break; - case PS_META_F32: + case PS_DATA_F32: col = psVectorAlloc(table->n, PS_TYPE_F32); for (row = 0; row < table->n; row++) { @@ -1603,5 +1603,5 @@ break; - case PS_META_F64: + case PS_DATA_F64: col = psVectorAlloc(table->n, PS_TYPE_F64); for (row = 0; row < table->n; row++) { @@ -1619,5 +1619,5 @@ break; - case PS_META_BOOL: + case PS_DATA_BOOL: col = psVectorAlloc(table->n, PS_TYPE_BOOL); for (row = 0; row < table->n; row++) { @@ -1635,5 +1635,5 @@ break; - case PS_META_STR: + case PS_DATA_STRING: colArray = psArrayAlloc(table->n); for (row = 0; row < table->n; row++) { @@ -1656,5 +1656,5 @@ } psFree(col); - } else if (item->type == PS_META_STR) { + } else if (item->type == PS_DATA_STRING) { psArray* col = psArrayAlloc(table->n); for (row = 0; row < table->n; row++) { @@ -1716,12 +1716,14 @@ while ( (item=psMetadataGetAndIncrement(iter)) != NULL) { - if (PS_META_IS_PRIMITIVE(item->type)) { - // operating on primitive data type, i.e., not a complex object + if (PS_DATA_IS_PRIMITIVE(item->type) || item->type == PS_DATA_STRING) { + // operating on primitive data type or string, i.e., not a complex object int colnum = 0; if ( fits_get_colnum(fits->fd, CASESEN, item->name, &colnum, &status) == 0) { // cooresponding column found in table - int dataType = 0; - convertPsTypeToFits(item->type, NULL, NULL, &dataType); + int dataType = TSTRING; // assume string unless it is a primative type + if (PS_DATA_IS_PRIMITIVE(item->type)) { + convertPsTypeToFits(item->type, NULL, NULL, &dataType); + } if (fits_write_col(fits->fd, dataType, colnum, row+1, 1, 1, &item->data,&status) != 0) { Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 5135) +++ /trunk/psLib/src/sys/psType.h (revision 5136) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-15 21:22:22 $ +* @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:25 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,6 +105,6 @@ PS_DATA_ARRAY, ///< psArray PS_DATA_BITSET, ///< psBitSet - // PS_DATA_CELL, ///< psCell - // PS_DATA_CHIP, ///< psChip + PS_DATA_CELL, ///< psCell + PS_DATA_CHIP, ///< psChip PS_DATA_CUBE, ///< psCube PS_DATA_FITS, ///< psFits @@ -127,6 +127,6 @@ PS_DATA_POLYNOMIAL4D, ///< psPolynomial4D PS_DATA_PROJECTION, ///< psProjection - // PS_DATA_READOUT, ///< psReadout - // PS_DATA_REGION, ///< psRegion + PS_DATA_READOUT, ///< psReadout + PS_DATA_REGION, ///< psRegion PS_DATA_SCALAR, ///< psScalar PS_DATA_SPHERE, ///< psSphere Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 5135) +++ /trunk/psLib/src/types/psMetadata.c (revision 5136) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.84 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-22 02:32:00 $ + * @version $Revision: 1.85 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:26 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -75,5 +75,5 @@ { - if (existing != NULL && existing->type == PS_META_MULTI) { + if (existing != NULL && existing->type == PS_DATA_METADATA_MULTI) { return existing; } @@ -83,5 +83,5 @@ psMetadataItem* item = psMetadataItemAlloc(key, - PS_META_MULTI, + PS_DATA_METADATA_MULTI, "", newList); @@ -113,5 +113,5 @@ psMemDecrRefCounter(metadataItem->comment); - if(!PS_META_IS_PRIMITIVE(type)) { + if(!PS_DATA_IS_PRIMITIVE(type)) { psFree(metadataItem->data.V); } @@ -178,9 +178,9 @@ } -METADATAITEM_ALLOC_TYPE(Str,const char*,PS_META_STR) -METADATAITEM_ALLOC_TYPE(F32,psF32,PS_META_F32) -METADATAITEM_ALLOC_TYPE(F64,psF64,PS_META_F64) -METADATAITEM_ALLOC_TYPE(S32,psS32,PS_META_S32) -METADATAITEM_ALLOC_TYPE(Bool,psBool,PS_META_BOOL) +METADATAITEM_ALLOC_TYPE(Str,const char*,PS_DATA_STRING) +METADATAITEM_ALLOC_TYPE(F32,psF32,PS_DATA_F32) +METADATAITEM_ALLOC_TYPE(F64,psF64,PS_DATA_F64) +METADATAITEM_ALLOC_TYPE(S32,psS32,PS_DATA_S32) +METADATAITEM_ALLOC_TYPE(Bool,psBool,PS_DATA_BOOL) psMetadataItem* psMetadataItemAllocV(const char *name, @@ -217,36 +217,58 @@ // Allocate and set metadata item name metadataItem->name = (char *)psAlloc(sizeof(char) * MAX_STRING_LENGTH); - vsprintf(metadataItem->name, name, argPtr); + vsnprintf(metadataItem->name, MAX_STRING_LENGTH, name, argPtr); // Set metadata item value switch(metadataItem->type) { - case PS_META_BOOL: + case PS_DATA_BOOL: metadataItem->data.B = (psBool)va_arg(argPtr, psS32); break; - case PS_META_S32: + case PS_DATA_S32: metadataItem->data.S32 = (psS32)va_arg(argPtr, psS32); break; - case PS_META_F32: + case PS_DATA_F32: metadataItem->data.F32 = (psF32)va_arg(argPtr, psF64); break; - case PS_META_F64: + case PS_DATA_F64: metadataItem->data.F64 = (psF64)va_arg(argPtr, psF64); break; - case PS_META_STR: + case PS_DATA_STRING: // Perform copy of input strings metadataItem->data.V = psStringNCopy(va_arg(argPtr, char *), MAX_STRING_LENGTH); break; - case PS_META_LIST: - case PS_META_VEC: - case PS_META_HASH: - case PS_META_LOOKUPTABLE: - case PS_META_JPEG: - case PS_META_PNG: - case PS_META_ASTROM: - case PS_META_UNKNOWN: - case PS_META_META: - case PS_META_MULTI: - case PS_META_ARRAY: - case PS_META_TIME: + 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 + case PS_DATA_HASH: ///< psHash + case PS_DATA_HISTOGRAM: ///< psHistogram + case PS_DATA_IMAGE: ///< psImage + case PS_DATA_KERNEL: ///< psKernel + case PS_DATA_LIST: ///< psList + case PS_DATA_LOOKUPTABLE: ///< psLookupTable + case PS_DATA_METADATA: ///< psMetadata + case PS_DATA_METADATAITEM: ///< psMetadataItem + case PS_DATA_MINIMIZATION: ///< psMinimization + case PS_DATA_PIXELS: ///< psPixels + case PS_DATA_PLANE: ///< psPlane + case PS_DATA_PLANEDISTORT: ///< psPlaneDistort + case PS_DATA_PLANETRANSFORM: ///< psPlaneTransform + case PS_DATA_POLYNOMIAL1D: ///< psPolynomial1D + case PS_DATA_POLYNOMIAL2D: ///< psPolynomial2D + case PS_DATA_POLYNOMIAL3D: ///< psPolynomial3D + 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 + case PS_DATA_SPHEREROT: ///< psSphereTransform + case PS_DATA_SPLINE1D: ///< psSpline1D + case PS_DATA_STATS: ///< psStats + case PS_DATA_TIME: ///< psTime + case PS_DATA_VECTOR: ///< psVector + case PS_DATA_METADATA_MULTI: // Copy of input data not performed due to variability of data types metadataItem->data.V = psMemIncrRefCounter(va_arg(argPtr, psPtr)); @@ -313,8 +335,8 @@ existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - if (item->type == PS_META_MULTI) { - // the incoming entry is PS_META_MULTI - - // force the hash entry to be PS_META_MULTI + if (item->type == PS_DATA_METADATA_MULTI) { + // the incoming entry is PS_DATA_METADATA_MULTI + + // force the hash entry to be PS_DATA_METADATA_MULTI existingEntry = makeMetaMulti(mdTable,key,existingEntry); @@ -335,8 +357,8 @@ // how the item is added to the hash depends on prior existence, flags, etc. if(existingEntry != NULL) { // prior existence - if (existingEntry->type == PS_META_MULTI || (flags & PS_META_DUPLICATE_OK) != 0) { + if (existingEntry->type == PS_DATA_METADATA_MULTI || (flags & PS_META_DUPLICATE_OK) != 0) { // duplicate entries allowed - add another entry. - // make sure the existing entry is PS_META_MULTI + // make sure the existing entry is PS_DATA_METADATA_MULTI existingEntry = makeMetaMulti(mdTable,key,existingEntry); @@ -429,18 +451,18 @@ } -METADATA_ADD_TYPE(Bool,psBool,PS_META_BOOL) -METADATA_ADD_TYPE(S32,psS32,PS_META_S32) -METADATA_ADD_TYPE(F32,psF32,PS_META_F32) -METADATA_ADD_TYPE(F64,psF64,PS_META_F64) -METADATA_ADD_TYPE(List,psList*,PS_META_LIST) -METADATA_ADD_TYPE(Str,const char*,PS_META_STR) -METADATA_ADD_TYPE(Vector,psVector*,PS_META_VEC) -METADATA_ADD_TYPE(Image,psImage*,PS_META_IMG) -METADATA_ADD_TYPE(Hash,psHash*,PS_META_HASH) -METADATA_ADD_TYPE(LookupTable,psLookupTable*,PS_META_LOOKUPTABLE) -METADATA_ADD_TYPE(Unknown,void*,PS_META_UNKNOWN) -METADATA_ADD_TYPE(Metadata,psMetadata*,PS_META_META) -METADATA_ADD_TYPE(Array,psArray*,PS_META_ARRAY) -METADATA_ADD_TYPE(Time,psTime*,PS_META_TIME) +METADATA_ADD_TYPE(Bool,psBool,PS_DATA_BOOL) +METADATA_ADD_TYPE(S32,psS32,PS_DATA_S32) +METADATA_ADD_TYPE(F32,psF32,PS_DATA_F32) +METADATA_ADD_TYPE(F64,psF64,PS_DATA_F64) +METADATA_ADD_TYPE(List,psList*,PS_DATA_LIST) +METADATA_ADD_TYPE(Str,const char*,PS_DATA_STRING) +METADATA_ADD_TYPE(Vector,psVector*,PS_DATA_VECTOR) +METADATA_ADD_TYPE(Image,psImage*,PS_DATA_IMAGE) +METADATA_ADD_TYPE(Hash,psHash*,PS_DATA_HASH) +METADATA_ADD_TYPE(LookupTable,psLookupTable*,PS_DATA_LOOKUPTABLE) +METADATA_ADD_TYPE(Unknown,void*,PS_DATA_UNKNOWN) +METADATA_ADD_TYPE(Metadata,psMetadata*,PS_DATA_METADATA) +METADATA_ADD_TYPE(Array,psArray*,PS_DATA_ARRAY) +METADATA_ADD_TYPE(Time,psTime*,PS_DATA_TIME) bool psMetadataRemove(psMetadata *md, @@ -464,5 +486,5 @@ return false; } - if (entry->type == PS_META_MULTI) { + if (entry->type == PS_DATA_METADATA_MULTI) { psMetadataItem* listItem; psListIterator* iter = psListIteratorAlloc( @@ -499,5 +521,5 @@ } - if (tableItem->type == PS_META_MULTI) { + if (tableItem->type == PS_DATA_METADATA_MULTI) { // multiple entries with same key, remove just the specified one psListRemoveData(tableItem->data.list, entry); @@ -548,10 +570,10 @@ return NULL; } - if (metadataItem->type == PS_META_MULTI) { + if (metadataItem->type == PS_DATA_METADATA_MULTI) { // if multiple keys found, use the first. metadataItem = (psMetadataItem*)((metadataItem->data.list)->head); } - if(PS_META_IS_PRIMITIVE(metadataItem->type)) { + if(PS_DATA_IS_PRIMITIVE(metadataItem->type)) { if (status) { *status = false; @@ -583,5 +605,5 @@ return 0; \ } \ - if (metadataItem->type == PS_META_MULTI) { \ + if (metadataItem->type == PS_DATA_METADATA_MULTI) { \ /* if multiple keys found, use the first. */ \ metadataItem = (psMetadataItem*)((metadataItem->data.list)->head); \ @@ -589,14 +611,14 @@ \ switch (metadataItem->type) { \ - case PS_META_S32: \ + case PS_DATA_S32: \ value = (ps##TYPE)metadataItem->data.S32; \ break; \ - case PS_META_F32: \ + case PS_DATA_F32: \ value = (ps##TYPE)metadataItem->data.F32; \ break; \ - case PS_META_F64: \ + case PS_DATA_F64: \ value = (ps##TYPE)metadataItem->data.F64; \ break; \ - case PS_META_BOOL: \ + case PS_DATA_BOOL: \ if (metadataItem->data.B) { \ value = 1; \ @@ -793,10 +815,10 @@ psError(PS_ERR_IO, true, "Couldn't find %s in the metadata.\n"); } - } else if (item->type != PS_META_META) { + } else if (item->type != PS_DATA_METADATA) { // The value at the key isn't metadata if (status) { *status = false; } else { - psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_META_META, as expected.\n"); + psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_DATA_META, as expected.\n"); } value = NULL; @@ -825,10 +847,10 @@ psError(PS_ERR_IO, true, "Couldn't find %s in the metadata.\n"); } - } else if (item->type != PS_META_STR) { + } else if (item->type != PS_DATA_STRING) { // The value at the key isn't of the desired type if (status) { *status = false; } else { - psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_META_STR, as expected.\n"); + psLogMsg(__func__, PS_LOG_WARN, "%s isn't of type PS_DATA_STRING, as expected.\n"); } value = NULL; @@ -860,8 +882,8 @@ printf(": "); switch (item->type) { - case PS_META_STR: + case PS_DATA_STRING: printf("%s", (char*)(item->data.V)); break; - case PS_META_BOOL: + case PS_DATA_BOOL: if (item->data.B) { printf("True"); @@ -870,14 +892,14 @@ } break; - case PS_META_S32: + case PS_DATA_S32: printf("%d", item->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("%f", item->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("%f", item->data.F64); break; - case PS_META_META: + case PS_DATA_METADATA: printf("\n"); psMetadataPrint(item->data.V, level + 1); @@ -981,18 +1003,18 @@ { // Only doing a representative set of types - case PS_META_S32: + case PS_DATA_S32: newItem = psMetadataItemAlloc(item->name, item->type, item->comment, atoi(argv[argnum])); psArgumentRemove(argnum, argc, argv); break; - case PS_META_F32: + case PS_DATA_F32: newItem = psMetadataItemAlloc(item->name, item->type, item->comment, atof(argv[argnum])); psArgumentRemove(argnum, argc, argv); break; - case PS_META_BOOL: + case PS_DATA_BOOL: // Turn option on; no optional argument to remove newItem = psMetadataItemAlloc(item->name, item->type, item->comment, true); break; // XXX: Include the other numerical types - case PS_META_STR: { + case PS_DATA_STRING: { //psString string = psStringCopy(argv[argnum]); // Get the argument into PS memory management //psFree(string); @@ -1032,6 +1054,6 @@ if (argItem) { psArgumentRemove(i, argc, argv); // Remove the switch - if (argItem->type != PS_META_MULTI) { - if (argItem->type != PS_META_BOOL && *argc < i + 1) { + if (argItem->type != PS_DATA_METADATA_MULTI) { + if (argItem->type != PS_DATA_BOOL && *argc < i + 1) { psError(PS_ERR_IO, true, "Required argument for %s is missing.\n", argItem->name); // XXX: Cleanup before returning @@ -1100,19 +1122,19 @@ switch (oldItem->type) { // Only doing a representative set of types - case PS_META_S32: + case PS_DATA_S32: oldItem->data.S32 = newItem->data.S32; break; - case PS_META_F32: + case PS_DATA_F32: oldItem->data.F32 = newItem->data.F32; break; - case PS_META_BOOL: + case PS_DATA_BOOL: oldItem->data.B = newItem->data.B; break; // XXX: Include the other numerical types - case PS_META_STR: + case PS_DATA_STRING: psFree(oldItem->data.V); oldItem->data.V = psMemIncrRefCounter(newItem->data.V); break; - case PS_META_MULTI: { + case PS_DATA_METADATA_MULTI: { psList *newMulti = psMemIncrRefCounter(newItem->data.V); // The new list of MULTI psList *oldMulti = oldItem->data.V; // The old list of MULTI @@ -1128,12 +1150,12 @@ switch (oldMultiItem->type) { // Only doing a representative set of types - case PS_META_S32: + case PS_DATA_S32: oldItem->data.S32 = newItem->data.S32; break; - case PS_META_F32: + case PS_DATA_F32: oldItem->data.F32 = newItem->data.F32; break; // XXX: Include the other numerical types - case PS_META_STR: + case PS_DATA_STRING: psFree(oldItem->data.V); oldItem->data.V = psMemIncrRefCounter(newItem->data.V); @@ -1166,15 +1188,15 @@ switch (arg->type) { // Only doing a representative set of types - case PS_META_S32: + case PS_DATA_S32: return arg->data.S32 >= 0 ? (int)log10f((float)arg->data.S32) + 1 : (int)log10f(-(float)arg->data.S32) + 2; // XXX: Other numerical types - case PS_META_F32: + case PS_DATA_F32: return arg->data.F32 >= 0 ? 12 : 13; // -d.dddddde?dd - case PS_META_F64: + case PS_DATA_F64: return arg->data.F64 >= 0 ? 12 : 13; // -d.dddddde?dd - case PS_META_BOOL: + case PS_DATA_BOOL: return arg->data.B ? 4 : 5; - case PS_META_STR: + case PS_DATA_STRING: return strlen(arg->data.V); default: @@ -1231,15 +1253,15 @@ switch (argItem->type) { // Only doing a representative set of types - case PS_META_S32: + case PS_DATA_S32: printf("%d", argItem->data.S32); break; // XXX: Other numerical types - case PS_META_F32: + case PS_DATA_F32: printf("%.6e", argItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("%.6e", argItem->data.F64); break; - case PS_META_BOOL: + case PS_DATA_BOOL: if (argItem->data.B) { printf("TRUE"); @@ -1248,5 +1270,5 @@ } break; - case PS_META_STR: + case PS_DATA_STRING: printf("%s", (char*)(argItem->data.V)); break; Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 5135) +++ /trunk/psLib/src/types/psMetadata.h (revision 5136) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-15 21:22:22 $ +* @version $Revision: 1.65 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:26 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,39 +32,14 @@ /// @{ -/** Metadata item type. - * - * Enumeration for maintaining metadata item types. - */ -typedef enum { - PS_META_S32 = PS_TYPE_S32, ///< psS32 primitive data. - PS_META_F32 = PS_TYPE_F32, ///< psF32 primitive data. - PS_META_F64 = PS_TYPE_F64, ///< psF64 primitive data. - PS_META_BOOL = PS_TYPE_BOOL, ///< psBool primitive data. - PS_META_LIST = 0x10000, ///< List data (Stored as item.data.list). - PS_META_STR, ///< String data (Stored as item.data.V). - PS_META_VEC, ///< Vector data (Stored as item.data.V). - PS_META_IMG, ///< Image data (Stored as item.data.V). - PS_META_HASH, ///< Hash data (Stored as item.data.V). - PS_META_LOOKUPTABLE, ///< Lookup table data (Stored as item.data.V). - PS_META_JPEG, ///< JPEG data (Stored as item.data.V). - PS_META_PNG, ///< PNG data (Stored as item.data.V). - PS_META_ASTROM, ///< Astrometric coefficients (Stored as item.data.V). - PS_META_UNKNOWN, ///< Other data (Stored as item.data.V). - PS_META_MULTI, ///< Used internally, do not create an metadata item of this type. - PS_META_META = PS_DATA_METADATA, ///< Metadata data (Stored as item.data.md). - PS_META_ARRAY, ///< Array data (Stored as item.data.V). - PS_META_TIME ///< psTime data (Stored as item.data.V). -} psMetadataType; -#define PS_META_IS_PRIMITIVE(TYPE) \ -(TYPE == PS_META_S32 || \ - TYPE == PS_META_F32 || \ - TYPE == PS_META_F64 || \ - TYPE == PS_META_BOOL) - -#define PS_META_PRIMITIVE_TYPE(METATYPE) ( \ - (METATYPE==PS_META_S32) ? PS_TYPE_S32 : \ - (METATYPE==PS_META_F32) ? PS_TYPE_F32 : \ - (METATYPE==PS_META_F64) ? PS_TYPE_F64 : \ - (METATYPE==PS_META_BOOL) ? PS_TYPE_BOOL : 0 ) +#define PS_DATA_IS_PRIMITIVE(TYPE) \ +(TYPE == PS_DATA_S32 || \ + TYPE == PS_DATA_F32 || \ + TYPE == PS_DATA_F64 || \ + TYPE == PS_DATA_BOOL) + +#define PS_DATA_PRIMITIVE_TYPE(DATATYPE) ( \ + (DATATYPE==PS_DATA_S32 || DATATYPE==PS_DATA_F32 || \ + DATATYPE==PS_DATA_F64 || DATATYPE==PS_DATA_BOOL) ? DATATYPE : 0) + /** Option flags for psMetadata functions Index: /trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.c (revision 5135) +++ /trunk/psLib/src/types/psMetadataConfig.c (revision 5136) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-23 02:39:06 $ +* @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:26 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -411,5 +411,5 @@ const psMetadataItem* item) { - psMetadataType type; + psDataType type; psBool success = true; @@ -436,14 +436,14 @@ #define METADATAITEM_NUMERIC_CAST(FORMAT_TYPE) { \ switch(type) { \ - case PS_META_BOOL: \ + case PS_DATA_BOOL: \ fprintf(fd, format, (FORMAT_TYPE) item->data.B); \ break; \ - case PS_META_S32: \ + case PS_DATA_S32: \ fprintf(fd,format,(FORMAT_TYPE) item->data.S32); \ break; \ - case PS_META_F32: \ + case PS_DATA_F32: \ fprintf(fd, format,(FORMAT_TYPE) item->data.F32); \ break; \ - case PS_META_F64: \ + case PS_DATA_F64: \ fprintf(fd, format,(FORMAT_TYPE) item->data.F64); \ break; \ @@ -478,5 +478,5 @@ break; case 's': - if (type == PS_META_STR) { + if (type == PS_DATA_STRING) { fprintf(fd,format,(char*)item->data.V); } else { @@ -573,15 +573,15 @@ case 'I': success = psMetadataAdd(output, PS_LIST_TAIL, keyName, - PS_META_S32 | PS_META_DUPLICATE_OK, + PS_DATA_S32 | PS_META_DUPLICATE_OK, keyComment, atoi(keyValue)); break; case 'F': success = psMetadataAdd(output, PS_LIST_TAIL, keyName, - PS_META_F64 | PS_META_DUPLICATE_OK, + PS_DATA_F64 | PS_META_DUPLICATE_OK, keyComment, atof(keyValue)); break; case 'C': success = psMetadataAdd(output, PS_LIST_TAIL, keyName, - PS_META_STR | PS_META_DUPLICATE_OK, + PS_DATA_STRING | PS_META_DUPLICATE_OK, keyComment, keyValue); break; @@ -589,5 +589,5 @@ tempBool = (keyValue[0] == 'T') ? 1 : 0; success = psMetadataAdd(output, PS_LIST_TAIL, keyName, - PS_META_BOOL | PS_META_DUPLICATE_OK, + PS_DATA_BOOL | PS_META_DUPLICATE_OK, keyComment, tempBool); break; @@ -734,5 +734,5 @@ psBool returnValue = true; psBool addStatus = false; - psMetadataType mdType = PS_META_UNKNOWN; + psDataType mdType = PS_DATA_UNKNOWN; psElemType vectorType = PS_TYPE_S8; char* strType = NULL; @@ -769,5 +769,5 @@ // Check if the keyName specifies a vector and if so use strType token to find vector type if(*keyName == '@') { - mdType = PS_META_VEC; + mdType = PS_DATA_VECTOR; // Get the type of vector if(!strncmp(strType, "U8", 2)) { @@ -798,20 +798,20 @@ } } else if(!strncmp(strType, "STR", 3)) { - mdType = PS_META_STR; + mdType = PS_DATA_STRING; } else if(!strncmp(strType, "BOOL", 4)) { - mdType = PS_META_BOOL; + mdType = PS_DATA_BOOL; } else if(!strncmp(strType, "S32", 3)) { - mdType = PS_META_S32; + mdType = PS_DATA_S32; } else if(!strncmp(strType, "F32", 3)) { - mdType = PS_META_F32; + mdType = PS_DATA_F32; } else if(!strncmp(strType, "F64", 3)) { - mdType = PS_META_F64; + mdType = PS_DATA_F64; } else if(!strncmp(strType, "MULTI", 5)) { - mdType = PS_META_MULTI; + mdType = PS_DATA_METADATA_MULTI; } else if(!strncmp(strType, "METADATA", 8)) { - mdType = PS_META_META; + mdType = PS_DATA_METADATA; } else if( !strncmp(strType, "PS_TIME_UTC", 12) || !strncmp(strType, "PS_TIME_TAI", 12) || !strncmp(strType, "PS_TIME_UT1", 12) || !strncmp(strType, "PS_TIME_TT", 12)) { - mdType = PS_META_TIME; + mdType = PS_DATA_TIME; } else { // Search through user types @@ -824,5 +824,5 @@ // Add metadata item md = ((p_psParseLevelInfo*)(levelArray->data[*level]))->metadata; - addStatus = psMetadataAdd(md,PS_LIST_TAIL,keyName,PS_META_META | flags,"",tempMeta); + addStatus = psMetadataAdd(md,PS_LIST_TAIL,keyName,PS_DATA_METADATA | flags,"",tempMeta); // Check for add failure if (! addStatus) { @@ -858,5 +858,5 @@ // If type is not MULTI or META then get the value and comment - if((mdType != PS_META_MULTI) && (mdType != PS_META_META)) { + if((mdType != PS_DATA_METADATA_MULTI) && (mdType != PS_DATA_METADATA)) { // Get the metadata item value if there is one. status = 0; @@ -893,10 +893,10 @@ nonUniqueKeys = ((p_psParseLevelInfo*)(levelArray->data[*level]))->nonUniqueKeyArray; switch(mdType) { - case PS_META_STR: + case PS_DATA_STRING: addStatus = psMetadataAdd(md, PS_LIST_TAIL, keyName, mdType | flags, strComment, strValue); break; - case PS_META_BOOL: + case PS_DATA_BOOL: tempBool = parseBool(strValue, &status); if(!status) { @@ -910,6 +910,6 @@ } break; - case PS_META_F32: - case PS_META_F64: + case PS_DATA_F32: + case PS_DATA_F64: tempDbl = parseValue(strValue, &status); if(!status) { @@ -924,5 +924,5 @@ } break; - case PS_META_S32: + case PS_DATA_S32: tempInt = (psS32)parseValue(strValue, &status); if(!status) { @@ -936,5 +936,5 @@ } break; - case PS_META_TIME: + case PS_DATA_TIME: if( !strncmp(strType, "PS_TIME_UTC", 12) ) timeType = PS_TIME_UTC; @@ -957,5 +957,5 @@ psFree(mTime); break; - case PS_META_VEC: + case PS_DATA_VECTOR: tempVec = parseVector(strValue, vectorType, &status); if(!status) { @@ -970,5 +970,5 @@ psFree(tempVec); break; - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: // Add key to non-unique array of keys // Check for duplicate MULTI lines @@ -987,5 +987,5 @@ psFree(tempStr); break; - case PS_META_META: + case PS_DATA_METADATA: // Create next level info nextLevelInfo = p_psParseLevelInfoAlloc(); @@ -1120,5 +1120,5 @@ addStatus = psMetadataAdd(upperLevelInfo->metadata, PS_LIST_TAIL,lowerLevelInfo->name, - PS_META_META | flags, + PS_DATA_METADATA | flags, "", lowerLevelInfo->metadata); @@ -1242,11 +1242,11 @@ while ( (item = psMetadataGetAndIncrement(iter)) ) { type = item->type; - if ( type == PS_META_STR) + if ( type == PS_DATA_STRING) type = PS_DATA_STRING; - if ( type == PS_META_VEC) + if ( type == PS_DATA_VECTOR) type = PS_DATA_VECTOR; - if ( type == PS_META_TIME) + if ( type == PS_DATA_TIME) type = PS_DATA_TIME; - if ( item->type == PS_META_META) + if ( item->type == PS_DATA_METADATA) type = PS_DATA_METADATA; Index: /trunk/psLib/src/xml/psXML.c =================================================================== --- /trunk/psLib/src/xml/psXML.c (revision 5135) +++ /trunk/psLib/src/xml/psXML.c (revision 5136) @@ -10,6 +10,6 @@ * @author David Robbins, MHPCC * -* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-15 21:22:22 $ +* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -68,10 +68,4 @@ while ( item != NULL ) { type = item->type; - if ( type == PS_META_STR) - type = PS_DATA_STRING; - if ( type == PS_META_VEC) - type = PS_DATA_VECTOR; - if ( type == PS_META_TIME) - type = PS_DATA_TIME; switch (type) { case PS_DATA_BOOL: Index: /trunk/psLib/test/db/tst_psDB.c =================================================================== --- /trunk/psLib/test/db/tst_psDB.c (revision 5135) +++ /trunk/psLib/test/db/tst_psDB.c (revision 5136) @@ -9,6 +9,6 @@ * @author Aaron Culliney, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-15 02:40:20 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:29 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1612,7 +1612,7 @@ switch(itemNum) { case 0: - if(mdItem->type != PS_META_VEC) { + if(mdItem->type != PS_DATA_VECTOR) { psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", - itemNum,mdItem->type,PS_META_VEC); + itemNum,mdItem->type,PS_DATA_VECTOR); psDBDropTable(dbh,table); psDBCleanup(dbh); @@ -1642,7 +1642,7 @@ break; case 1: - if(mdItem->type != PS_META_VEC) { + if(mdItem->type != PS_DATA_VECTOR) { psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", - itemNum,mdItem->type,PS_META_VEC); + itemNum,mdItem->type,PS_DATA_VECTOR); psDBDropTable(dbh,table); psDBCleanup(dbh); @@ -1672,7 +1672,7 @@ break; case 2: - if(mdItem->type != PS_META_VEC) { + if(mdItem->type != PS_DATA_VECTOR) { psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", - itemNum,mdItem->type,PS_META_VEC); + itemNum,mdItem->type,PS_DATA_VECTOR); psDBDropTable(dbh,table); psDBCleanup(dbh); @@ -1702,7 +1702,7 @@ break; case 3: - if(mdItem->type != PS_META_VEC) { + if(mdItem->type != PS_DATA_VECTOR) { psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", - itemNum,mdItem->type,PS_META_VEC); + itemNum,mdItem->type,PS_DATA_VECTOR); psDBDropTable(dbh,table); psDBCleanup(dbh); @@ -1732,7 +1732,7 @@ break; case 4: - if(mdItem->type != PS_META_VEC) { + if(mdItem->type != PS_DATA_VECTOR) { psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", - itemNum,mdItem->type,PS_META_VEC); + itemNum,mdItem->type,PS_DATA_VECTOR); psDBDropTable(dbh,table); psDBCleanup(dbh); @@ -1762,7 +1762,7 @@ break; case 5: - if(mdItem->type != PS_META_ARRAY) { + if(mdItem->type != PS_DATA_ARRAY) { psError(PS_ERR_UNKNOWN,true,"Column #%d type %d not as expected %d", - itemNum,mdItem->type,PS_META_ARRAY); + itemNum,mdItem->type,PS_DATA_ARRAY); psDBDropTable(dbh,table); psDBCleanup(dbh); Index: /trunk/psLib/test/fits/tst_psFits.c =================================================================== --- /trunk/psLib/test/fits/tst_psFits.c (revision 5135) +++ /trunk/psLib/test/fits/tst_psFits.c (revision 5136) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-27 01:33:41 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:30 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -101,27 +101,27 @@ psMetadataAdd(header,PS_LIST_TAIL, "MYINT", - PS_META_S32, + PS_DATA_S32, "psS32 Item", (psS32)lcv); psMetadataAdd(header,PS_LIST_TAIL, "MYFLT", - PS_META_F32, + PS_DATA_F32, "psF32 Item", (float)(1.0f/(float)(1+lcv))); psMetadataAdd(header,PS_LIST_TAIL, "MYDBL", - PS_META_F64, + PS_DATA_F64, "psF64 Item", (double)(1.0/(double)(1+lcv))); psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL", - PS_META_BOOL, + PS_DATA_BOOL, "psBool Item", (lcv%2 == 0)); psMetadataAdd(header,PS_LIST_TAIL, "MYSTR", - PS_META_STR, + PS_DATA_STRING, "String Item", extname); psMetadataAdd(header,PS_LIST_TAIL, "EXTNAME", - PS_META_STR, + PS_DATA_STRING, "Extension Name", extname); @@ -175,22 +175,29 @@ psMetadataAdd(header,PS_LIST_TAIL, "MYINT", - PS_META_S32, + PS_DATA_S32, "psS32 Item", (psS32)row); psMetadataAdd(header,PS_LIST_TAIL, "MYFLT", - PS_META_F32, + PS_DATA_F32, "psF32 Item", (float)(1.0f/(float)(1+row))); psMetadataAdd(header,PS_LIST_TAIL, "MYDBL", - PS_META_F64, + PS_DATA_F64, "psF64 Item", (double)(1.0/(double)(1+row))); psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL", - PS_META_BOOL, + PS_DATA_BOOL, "psBool Item", (row%2 == 0)); + + char* str = NULL; + psStringAppend(&str,"row=%d",row); + psMetadataAdd(header,PS_LIST_TAIL, "MYSTR", + PS_DATA_STRING, + "psString Item", + str); table->data[row] = header; @@ -685,5 +692,5 @@ if (boolItem == NULL || - boolItem->type != PS_META_BOOL) { + boolItem->type != PS_DATA_BOOL) { psError(PS_ERR_UNKNOWN, true, "Failed to retrieve psBool metadata item from file."); Index: /trunk/psLib/test/types/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadataIO.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadataIO.c (revision 5136) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-27 01:33:41 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -88,11 +88,11 @@ "","","","A number","" }; -const psMetadataType testConfig1TypeOverwrite[] = - { - PS_META_F64, PS_META_STR, PS_META_BOOL, PS_META_VEC, PS_META_STR, - PS_META_STR, PS_META_STR, PS_META_STR, PS_META_STR, PS_META_F64, - PS_META_BOOL, PS_META_VEC, PS_META_VEC, PS_META_VEC, PS_META_VEC, - PS_META_VEC, PS_META_VEC, PS_META_VEC, PS_META_VEC, PS_META_VEC, - PS_META_META, PS_META_META, PS_META_META, PS_META_S32, PS_META_META +const psDataType testConfig1TypeOverwrite[] = + { + PS_DATA_F64, PS_DATA_STRING, PS_DATA_BOOL, PS_DATA_VECTOR, PS_DATA_STRING, + PS_DATA_STRING, PS_DATA_STRING, PS_DATA_STRING, PS_DATA_STRING, PS_DATA_F64, + PS_DATA_BOOL, PS_DATA_VECTOR, PS_DATA_VECTOR, PS_DATA_VECTOR, PS_DATA_VECTOR, + PS_DATA_VECTOR, PS_DATA_VECTOR, PS_DATA_VECTOR, PS_DATA_VECTOR, PS_DATA_VECTOR, + PS_DATA_METADATA, PS_DATA_METADATA, PS_DATA_METADATA, PS_DATA_S32, PS_DATA_METADATA }; const psS32 testConfig1ValueS32Overwrite[] = @@ -201,7 +201,7 @@ "EXTNAME","BIASSEC","CHIP" }; -const psMetadataType testConfig1ValueMetaTypes1[] = - { - PS_META_STR, PS_META_STR, PS_META_STR +const psDataType testConfig1ValueMetaTypes1[] = + { + PS_DATA_STRING, PS_DATA_STRING, PS_DATA_STRING }; const char* testConfig1ValueMetaValue1[] = @@ -214,7 +214,7 @@ "EXTNAME","BIASSEC","CHIP" }; -const psMetadataType testConfig1ValueMetaTypes2[] = - { - PS_META_STR, PS_META_STR, PS_META_STR +const psDataType testConfig1ValueMetaTypes2[] = + { + PS_DATA_STRING, PS_DATA_STRING, PS_DATA_STRING }; const char* testConfig1ValueMetaValue2[] = @@ -227,7 +227,7 @@ "EXTNAME","BIASSEC","CHIP","NCELL" }; -const psMetadataType testConfig1ValueMetaTypes3[] = - { - PS_META_STR, PS_META_STR, PS_META_STR, PS_META_S32 +const psDataType testConfig1ValueMetaTypes3[] = + { + PS_DATA_STRING, PS_DATA_STRING, PS_DATA_STRING, PS_DATA_S32 }; const char* testConfig1ValueMetaValueStr3[] = @@ -383,25 +383,25 @@ switch(metadataItem->type) { - case PS_META_BOOL: + case PS_DATA_BOOL: printf("%s%-25s BOOL %40d",indentStr,metadataItem->name,metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("%s%-25s S32 %40d",indentStr,metadataItem->name,metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("%s%-25s F32 %40f",indentStr,metadataItem->name,metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("%s%-25s F64 %40lf",indentStr,metadataItem->name,metadataItem->data.F64); break; - case PS_META_VEC: + case PS_DATA_VECTOR: vecStr = (char*)vectorToConfigString((psVector*)metadataItem->data.V); printf("%s@%-24s %s",indentStr,metadataItem->name,vecStr); psFree(vecStr); break; - case PS_META_STR: + case PS_DATA_STRING: printf("%s%-25s STR %40s",indentStr,metadataItem->name,(char*)metadataItem->data.V); break; - case PS_META_META: + case PS_DATA_METADATA: printf("%s%-25s METADATA\n",indentStr,metadataItem->name); char nestedStr[256] = " "; @@ -545,5 +545,5 @@ // Compare values switch(entryChild->type) { - case PS_META_S32: + case PS_DATA_S32: if(entryChild->data.S32 != testConfig1ValueS32Overwrite[i]) { psError(PS_ERR_UNKNOWN,true,"File: %s : Value %d not as expected %d", @@ -552,5 +552,5 @@ } break; - case PS_META_F32: + case PS_DATA_F32: if(fabs(entryChild->data.F32 - testConfig1ValueF32Overwrite[i]) > ERROR_TOL) { psError(PS_ERR_UNKNOWN,true,"File: %s : Value %f not as expected %f", @@ -559,5 +559,5 @@ } break; - case PS_META_F64: + case PS_DATA_F64: if(fabs(entryChild->data.F64 - testConfig1ValueF64Overwrite[i]) > ERROR_TOL) { psError(PS_ERR_UNKNOWN,true,"File: %s : Value %lf not as expected %lf", @@ -566,5 +566,5 @@ } break; - case PS_META_BOOL: + case PS_DATA_BOOL: if(entryChild->data.B != testConfig1ValueBoolOverwrite[i]) { psError(PS_ERR_UNKNOWN,true,"File: %s : Value %d not as expected %d", @@ -573,5 +573,5 @@ } break; - case PS_META_STR: + case PS_DATA_STRING: if(strcmp(entryChild->data.V,testConfig1ValueStrOverwrite[i]) != 0) { psError(PS_ERR_UNKNOWN,true,"File: %s : Value %s not as expected %s", @@ -580,5 +580,5 @@ } break; - case PS_META_VEC: + case PS_DATA_VECTOR: // Verify the correct number of entries switch(((psVector*)(entryChild->data.V))->type.type) { @@ -809,5 +809,5 @@ } break; - case PS_META_META: + case PS_DATA_METADATA: if(metaCounter == 0) { // Check if number of items is as expected @@ -890,5 +890,5 @@ } switch(mdChild->type) { - case PS_META_STR: + case PS_DATA_STRING: if(strcmp((char*)mdChild->data.V,testConfig1ValueMetaValueStr3[mdCounter]) != 0) { psError(PS_ERR_UNKNOWN,true,"File: %s : Metadata 3 value[%d] %s not as expected %s", @@ -898,5 +898,5 @@ } break; - case PS_META_S32: + case PS_DATA_S32: if(mdChild->data.S32 != testConfig1ValueMetaValueS323[mdCounter]) { psError(PS_ERR_UNKNOWN,true,"File: %s : Metadata 3 value[%d] %d not as expected %d", Index: /trunk/psLib/test/types/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_01.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadata_01.c (revision 5136) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-21 02:39:57 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -75,20 +75,20 @@ switch (metadataItem->type) { - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: printf("Key Value: %17c", ' '); break; - case PS_META_BOOL: + case PS_DATA_BOOL: printf("Key Value: %15d ", metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("Key Value: %15d ", metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("Key Value: %15.3f ", metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("Key Value: %15.3f ", metadataItem->data.F64); break; - case PS_META_STR: + case PS_DATA_STRING: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; @@ -98,5 +98,5 @@ printf("Key Comment: %s\n", metadataItem->comment); - if(metadataItem->data.V && metadataItem->type==PS_META_MULTI) { + if(metadataItem->data.V && metadataItem->type==PS_DATA_METADATA_MULTI) { printMetadataList(metadataItem->data.V, " "); } Index: /trunk/psLib/test/types/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_02.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadata_02.c (revision 5136) @@ -15,6 +15,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-13 02:47:01 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,20 +32,20 @@ switch (metadataItem->type) { - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: printf("Key Value: %17c", ' '); break; - case PS_META_BOOL: + case PS_DATA_BOOL: printf("Key Value: %15d ", metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("Key Value: %15d ", metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("Key Value: %15.3f ", metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("Key Value: %15.3f ", metadataItem->data.F64); break; - case PS_META_STR: + case PS_DATA_STRING: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; @@ -70,9 +70,9 @@ // Test A - Allocate metadata items printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 111); - item3 = psMetadataItemAlloc("myItem3", PS_META_F32, "I am a single precision floating point", 222.222); - item4 = psMetadataItemAlloc("myItem4", PS_META_F64, "I am a double precision floating point", 333.333); - item5 = psMetadataItemAlloc("myItem5", PS_META_STR, "I am a string", "HELLO WORLD"); + item1 = psMetadataItemAlloc("myItem1", PS_DATA_BOOL, "I am a boolean", true); + item2 = psMetadataItemAlloc("myItem2", PS_DATA_S32, "I am a signed integer", 111); + item3 = psMetadataItemAlloc("myItem3", PS_DATA_F32, "I am a single precision floating point", 222.222); + item4 = psMetadataItemAlloc("myItem4", PS_DATA_F64, "I am a double precision floating point", 333.333); + item5 = psMetadataItemAlloc("myItem5", PS_DATA_STRING, "I am a string", "HELLO WORLD"); printMetadataItem(item1); printMetadataItem(item2); @@ -87,5 +87,5 @@ "Null value for name not allowed", 0); psLogMsg(__func__,PS_LOG_INFO,"Following should produce error for null name."); - badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD"); + badItem = psMetadataItemAlloc(NULL, PS_DATA_STRING, "I am a string", "HELLO WORLD"); if (badItem != NULL) { psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item."); @@ -97,5 +97,5 @@ // Test C - Attempt to create metadata item with invalid type printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type", - "Invalid psMetadataType: 6", 0); + "Invalid psDataType: 6", 0); badItem = psMetadataItemAlloc("badItem", -1, "I am bad", "Bad comment"); printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true); Index: /trunk/psLib/test/types/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_03.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadata_03.c (revision 5136) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-21 02:39:57 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -35,20 +35,20 @@ switch (metadataItem->type) { - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: printf("Key Value: %17c", ' '); break; - case PS_META_BOOL: + case PS_DATA_BOOL: printf("Key Value: %15d ", metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("Key Value: %15d ", metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("Key Value: %15.3f ", metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("Key Value: %15.3f ", metadataItem->data.F64); break; - case PS_META_STR: + case PS_DATA_STRING: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; @@ -76,9 +76,9 @@ printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); metadata = psMetadataAlloc(); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55); - item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); - item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); - errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99); + item1 = psMetadataItemAlloc("myItem1", PS_DATA_BOOL, "I am a boolean", true); + item2 = psMetadataItemAlloc("myItem2", PS_DATA_S32, "I am a integer", 55); + item3 = psMetadataItemAlloc("myItem3", PS_DATA_BOOL, "I am a boolean", false); + item4 = psMetadataItemAlloc("myItem4", PS_DATA_S32, "I am a integer", 66); + errItem = psMetadataItemAlloc("errItem", PS_DATA_S32, "I am a integer", 99); printMetadataItem(item1); printMetadataItem(item2); @@ -94,5 +94,5 @@ return 10; } - if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_META_S32, "I am S32 integer",77)) { + if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_DATA_S32, "I am S32 integer",77)) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name."); return 11; @@ -115,5 +115,5 @@ return 14; } - if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_META_S32, "I am S32 integer",88) ) { + if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_DATA_S32, "I am S32 integer",88) ) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index."); return 15; @@ -210,5 +210,5 @@ mdTable = errMetadata->hash; errMetadata->hash = NULL; - if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) { + if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_DATA_S32, "Integer",22) ) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); return 24; Index: /trunk/psLib/test/types/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_04.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadata_04.c (revision 5136) @@ -25,6 +25,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-09-15 21:22:22 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -42,20 +42,20 @@ switch (metadataItem->type) { - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: printf("Key Value: %17c", ' '); break; - case PS_META_BOOL: + case PS_DATA_BOOL: printf("Key Value: %15d ", metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("Key Value: %15d ", metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("Key Value: %15.3f ", metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("Key Value: %15.3f ", metadataItem->data.F64); break; - case PS_META_STR: + case PS_DATA_STRING: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; @@ -93,12 +93,12 @@ strncpy(string, "String was here", 50); psMetadataAddF64(newMD, PS_LIST_HEAD, "yourItem1", 0, "I am a psF64", 4.14); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55); - item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); - item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); - item5 = psMetadataItemAlloc("myItem5", PS_META_F64, "I am a double", 3.14); - item6 = psMetadataItemAlloc("myItem6", PS_META_VEC, "I am a vector", vec); - item7 = psMetadataItemAlloc("myItem7", PS_META_META, "I am a metadata", newMD); - item8 = psMetadataItemAlloc("myItem8", PS_META_STR, "I am a string", string); + item1 = psMetadataItemAlloc("myItem1", PS_DATA_BOOL, "I am a boolean", true); + item2 = psMetadataItemAlloc("myItem2", PS_DATA_S32, "I am a integer", 55); + item3 = psMetadataItemAlloc("myItem3", PS_DATA_BOOL, "I am a boolean", false); + item4 = psMetadataItemAlloc("myItem4", PS_DATA_S32, "I am a integer", 66); + item5 = psMetadataItemAlloc("myItem5", PS_DATA_F64, "I am a double", 3.14); + item6 = psMetadataItemAlloc("myItem6", PS_DATA_VECTOR, "I am a vector", vec); + item7 = psMetadataItemAlloc("myItem7", PS_DATA_METADATA, "I am a metadata", newMD); + item8 = psMetadataItemAlloc("myItem8", PS_DATA_STRING, "I am a string", string); printMetadataItem(item1); printMetadataItem(item2); Index: /trunk/psLib/test/types/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_05.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadata_05.c (revision 5136) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-13 02:47:01 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,20 +39,20 @@ switch (metadataItem->type) { - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: printf("Key Value: %17c", ' '); break; - case PS_META_BOOL: + case PS_DATA_BOOL: printf("Key Value: %15d ", metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("Key Value: %15d ", metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("Key Value: %15.3f ", metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("Key Value: %15.3f ", metadataItem->data.F64); break; - case PS_META_STR: + case PS_DATA_STRING: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; @@ -80,11 +80,11 @@ printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items"); metadata = psMetadataAlloc(); - item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55); - item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); - item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); - item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14); - item6 = psMetadataItemAlloc("myItem6", PS_META_F64,"I am a double", 6.28); - item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS"); + item1 = psMetadataItemAlloc("myItem1", PS_DATA_BOOL, "I am a boolean", true); + item2 = psMetadataItemAlloc("myItem2", PS_DATA_S32, "I am a integer", 55); + item3 = psMetadataItemAlloc("myItem3", PS_DATA_BOOL, "I am a boolean", false); + item4 = psMetadataItemAlloc("myItem4", PS_DATA_S32, "I am a integer", 66); + item5 = psMetadataItemAlloc("myItem5", PS_DATA_F32, "I am a float", 3.14); + item6 = psMetadataItemAlloc("myItem6", PS_DATA_F64,"I am a double", 6.28); + item7 = psMetadataItemAlloc("myItem7", PS_DATA_STRING, "I am a string", "GNIRTS"); // item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown"); printMetadataItem(item1); Index: /trunk/psLib/test/types/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_06.c (revision 5135) +++ /trunk/psLib/test/types/tst_psMetadata_06.c (revision 5136) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-13 02:47:01 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-09-26 21:13:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,23 +30,23 @@ switch (metadataItem->type) { - case PS_META_MULTI: + case PS_DATA_METADATA_MULTI: printf("Key Value: %17c", ' '); break; - case PS_META_LIST: + case PS_DATA_LIST: printf("Key Value: %15s ", "psList"); break; - case PS_META_BOOL: + case PS_DATA_BOOL: printf("Key Value: %15d ", metadataItem->data.B); break; - case PS_META_S32: + case PS_DATA_S32: printf("Key Value: %15d ", metadataItem->data.S32); break; - case PS_META_F32: + case PS_DATA_F32: printf("Key Value: %15.3f ", metadataItem->data.F32); break; - case PS_META_F64: + case PS_DATA_F64: printf("Key Value: %15.3f ", metadataItem->data.F64); break; - case PS_META_STR: + case PS_DATA_STRING: printf("Key Value: %15s ", (char*)metadataItem->data.V); break; @@ -70,9 +70,9 @@ // Test A - Allocate metadata and items printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata and items"); - item1a = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true); - item1b = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 111); - item1c = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 222); - item2a = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 333); - item2b = psMetadataItemAlloc("myItem2", PS_META_LIST, "I am a list", NULL); + item1a = psMetadataItemAlloc("myItem1", PS_DATA_BOOL, "I am a boolean", true); + item1b = psMetadataItemAlloc("myItem1", PS_DATA_S32, "I am a signed integer", 111); + item1c = psMetadataItemAlloc("myItem1", PS_DATA_S32, "I am a signed integer", 222); + item2a = psMetadataItemAlloc("myItem2", PS_DATA_S32, "I am a signed integer", 333); + item2b = psMetadataItemAlloc("myItem2", PS_DATA_LIST, "I am a list", NULL); metadata = psMetadataAlloc(); printMetadataItem(item1a); @@ -118,5 +118,5 @@ tempItem = psMetadataLookup(metadata, item1a->name); - if (tempItem == NULL || tempItem->type != PS_META_MULTI) { + if (tempItem == NULL || tempItem->type != PS_DATA_METADATA_MULTI) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem didn't add additional metadata entry of same key."); return 22; @@ -137,5 +137,5 @@ printFooter(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node", true); tempItem = psMetadataLookup(metadata, item1a->name); - if (tempItem == NULL || tempItem->type != PS_META_MULTI) { + if (tempItem == NULL || tempItem->type != PS_DATA_METADATA_MULTI) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem didn't add additional metadata entry of same key."); return 24; Index: /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout (revision 5135) +++ /trunk/psLib/test/types/verified/tst_psMetadata_01.stdout (revision 5136) @@ -9,5 +9,5 @@ Key Name: BITPIX Key mdType: 0x00000104 Key Value: 8 Key Comment: number of bits per data pixel Key Name: NAXIS Key mdType: 0x00000104 Key Value: 0 Key Comment: number of data axes - Key Name: HISTORY Key mdType: 0x00010001 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 Contents of metadata table: @@ -15,5 +15,5 @@ Key Name: SIMPLE Key mdType: 0x00001301 Key Value: 1 Key Comment: file does conform to FITS standard Key Name: BITPIX Key mdType: 0x00000104 Key Value: 8 Key Comment: number of bits per data pixel - Key Name: HISTORY Key mdType: 0x00010001 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 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c) @@ -26,5 +26,5 @@ Contents of metadata list: - Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: XTENSION Key mdType: 0x00010000 Key Value: 'IMAGE ' Key Comment: IMAGE extension Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes @@ -33,9 +33,9 @@ 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: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_1' Key Comment: - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: EXTNAME Key mdType: 0x00010000 Key Value: 'MY_DATA_1' 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 + 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 Contents of metadata table: @@ -43,15 +43,15 @@ Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension - Key Name: BITPIX Key mdType: 0x0001000a Key Value: Key Comment: + 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: 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: 0x0001000a Key Value: Key Comment: - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_1' Key Comment: + Key Name: HISTORY Key mdType: 0x00010023 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 + 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 + Key Name: EXTNAME Key mdType: 0x00010000 Key Value: 'MY_DATA_1' Key Comment: ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c) @@ -64,5 +64,5 @@ Contents of metadata list: - Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: XTENSION Key mdType: 0x00010000 Key Value: 'IMAGE ' Key Comment: IMAGE extension Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes @@ -70,7 +70,7 @@ Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T + Key Name: EXTNAME Key mdType: 0x00010000 Key Value: 'MY_DATA_2' 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 Contents of metadata table: @@ -78,11 +78,11 @@ Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: XTENSION Key mdType: 0x00010000 Key Value: 'IMAGE ' Key Comment: IMAGE extension 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: 0x0001000a Key Value: Key Comment: - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: HISTORY Key mdType: 0x00010001 Key Value: Key Comment: File modified by user 'harman' with fv on 2004-08-04T - Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: + Key Name: HISTORY Key mdType: 0x00010023 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 + Key Name: EXTNAME Key mdType: 0x00010000 Key Value: 'MY_DATA_2' Key Comment: ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c) @@ -97,5 +97,5 @@ Contents of metadata list: - Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: XTENSION Key mdType: 0x00010000 Key Value: 'IMAGE ' Key Comment: IMAGE extension Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel Key Name: NAXIS Key mdType: 0x00000104 Key Value: 1 Key Comment: number of data axes @@ -103,5 +103,5 @@ Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 - Key Name: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: + Key Name: EXTNAME Key mdType: 0x00010000 Key Value: 'MY_DATA_2' Key Comment: Contents of metadata table: @@ -109,8 +109,8 @@ Key Name: NAXIS1 Key mdType: 0x00000104 Key Value: 64 Key Comment: length of data axis 1 Key Name: PCOUNT Key mdType: 0x00000104 Key Value: 0 Key Comment: required keyword; must = 0 - Key Name: XTENSION Key mdType: 0x00010001 Key Value: 'IMAGE ' Key Comment: IMAGE extension + Key Name: XTENSION Key mdType: 0x00010000 Key Value: 'IMAGE ' Key Comment: IMAGE extension 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: EXTNAME Key mdType: 0x00010001 Key Value: 'MY_DATA_2' Key Comment: + Key Name: EXTNAME Key mdType: 0x00010000 Key Value: 'MY_DATA_2' Key Comment: ---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c) Index: /trunk/psLib/test/types/verified/tst_psMetadata_02.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_02.stdout (revision 5135) +++ /trunk/psLib/test/types/verified/tst_psMetadata_02.stdout (revision 5136) @@ -9,5 +9,5 @@ Key Name: myItem3 Key mdType: 0x00000404 Key Value: 222.222 Key Comment: I am a single precision floating point Key Name: myItem4 Key mdType: 0x00000408 Key Value: 333.333 Key Comment: I am a double precision floating point -Key Name: myItem5 Key mdType: 0x00010001 Key Value: HELLO WORLD Key Comment: I am a string +Key Name: myItem5 Key mdType: 0x00010000 Key Value: HELLO WORLD Key Comment: I am a string ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_02.c) @@ -28,5 +28,5 @@ * TestPoint: psMetadata{Test C - Attempt to create metadata item with invalid type} * * TestType: Negative * -* ExpectedErrorText: Invalid psMetadataType: 6 * +* ExpectedErrorText: Invalid psDataType: 6 * * ExpectedStatusValue: 0 * \**********************************************************************************/ Index: /trunk/psLib/test/types/verified/tst_psMetadata_06.stdout =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_06.stdout (revision 5135) +++ /trunk/psLib/test/types/verified/tst_psMetadata_06.stdout (revision 5136) @@ -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: 0x00010000 Key Value: psList Key Comment: I am a list +Key Name: myItem2 Key mdType: 0x0001000b Key Value: psList Key Comment: I am a list ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata and items} | tst_psMetadata_06.c)