Index: /trunk/psLib/src/db/psDB.c =================================================================== --- /trunk/psLib/src/db/psDB.c (revision 4890) +++ /trunk/psLib/src/db/psDB.c (revision 4891) @@ -12,6 +12,6 @@ * @author Joshua Hoblitt * - * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-26 20:00:57 $ + * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-27 01:33:40 $ * * Copyright 2005 Joshua Hoblitt, University of Hawaii @@ -502,16 +502,16 @@ // copy field data and convert NULLs to the appropriate NaN value if (pType == PS_META_STR) { - psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, "", data); + psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, 0, "", data); } else if (pType == PS_META_S32) { - psMetadataAddS32(md, PS_LIST_TAIL, field[i].name, "", atoll(data)); + psMetadataAddS32(md, PS_LIST_TAIL, field[i].name, 0, "", atoll(data)); } else if (pType == PS_META_F32) { - psMetadataAddF32(md, PS_LIST_TAIL, field[i].name, "", atof(data)); + psMetadataAddF32(md, PS_LIST_TAIL, field[i].name, 0, "", atof(data)); } else if (pType == PS_META_F64) { - psMetadataAddF64(md, PS_LIST_TAIL, field[i].name, "", atof(data)); + psMetadataAddF64(md, PS_LIST_TAIL, field[i].name, 0, "", atof(data)); } else if (pType == PS_META_BOOL) { psMetadataAdd(md, PS_LIST_TAIL, field[i].name, pType, "", atoi(data)); } else { // XXX: assume binary string ... - psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, "", data); + psMetadataAddStr(md, PS_LIST_TAIL, field[i].name, 0, "", data); } @@ -713,10 +713,10 @@ // PS_META_UNKNOWN -> PS_META_ARRAY ? column = psDBSelectColumn(dbh, tableName, field[i].name, 0); - psMetadataAddArray(table, PS_LIST_TAIL, field[i].name, "", column); + psMetadataAddArray(table, PS_LIST_TAIL, field[i].name, 0, "", column); // psMetadataAddStr(table, PS_LIST_TAIL, field[i].name, "", column); psFree(column); } else { column = psDBSelectColumnNum(dbh, tableName, field[i].name, pType, 0); - psMetadataAddVector(table, PS_LIST_TAIL, field[i].name, "", column); + psMetadataAddVector(table, PS_LIST_TAIL, field[i].name, 0, "", column); psFree(column); } Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 4890) +++ /trunk/psLib/src/fits/psFits.c (revision 4891) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-15 02:33:54 $ + * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -606,5 +606,5 @@ psMetadata* header = psFitsReadHeader(NULL, fits); if (name != NULL && header != NULL) { - psMetadataAddMetadata(out, PS_LIST_HEAD, name, "FITS Header", + psMetadataAddMetadata(out, PS_LIST_HEAD, name, 0, "FITS Header", header); } else { // XXX: is this a warning or error? Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 4890) +++ /trunk/psLib/src/types/psMetadata.c (revision 4891) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.77 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-24 22:00:53 $ +* @version $Revision: 1.78 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -409,6 +409,6 @@ #define METADATA_ADD_TYPE(NAME,TYPE,METATYPE) \ psBool psMetadataAdd##NAME(psMetadata* md, long where, const char* name, \ - const char* comment, TYPE value) { \ - return psMetadataAdd(md,where,name, METATYPE,comment,value); \ + int format, const char* comment, TYPE value) { \ + return psMetadataAdd(md,where,name, format | METATYPE,comment,value); \ } Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 4890) +++ /trunk/psLib/src/types/psMetadata.h (revision 4891) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-18 23:41:45 $ +* @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -307,4 +307,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psBool value ///< Value for metadata item data @@ -319,4 +320,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psS32 value ///< Value for metadata item data @@ -331,4 +333,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psF32 value ///< Value for metadata item data @@ -343,4 +346,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psF64 value ///< Value for metadata item data @@ -355,4 +359,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psList* value ///< psList for metadata item data @@ -367,4 +372,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item const char* value ///< String for metadata item data @@ -379,4 +385,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psVector* value ///< Vector for metadata item data @@ -391,4 +398,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psArray* value ///< Vector for metadata item data @@ -403,4 +411,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psImage* value ///< Image for metadata item data @@ -415,4 +424,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psHash* value ///< Hash for metadata item data @@ -427,4 +437,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psLookupTable* value ///< LookupTable for metadata item data @@ -439,4 +450,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psPtr value ///< Unknown for metadata item data @@ -451,4 +463,5 @@ long location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL const char* name, ///< Name of metadata item + int format, ///< psMetadataFlag options/flags const char* comment, ///< Comment for metadata item psMetadata* value ///< Metadata for metadata item data Index: /trunk/psLib/src/xml/psXML.c =================================================================== --- /trunk/psLib/src/xml/psXML.c (revision 4890) +++ /trunk/psLib/src/xml/psXML.c (revision 4891) @@ -10,6 +10,6 @@ * @author David Robbins, MHPCC * -* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-19 00:31:42 $ +* @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -347,5 +347,5 @@ strncpy(content, (char*)cur_node->properties->next->next->children->content, MAXSTR); - psMetadataAddS32(meta, PS_LIST_TAIL, name, "", + psMetadataAddS32(meta, PS_LIST_TAIL, name, 0, "", (int)strtol(content, NULL, 10)); break; @@ -354,5 +354,5 @@ strncpy(content, (const char*)cur_node->properties->next->next->children->content, MAXSTR); - psMetadataAddF32(meta, PS_LIST_TAIL, name, "", strtof(content, NULL)); + psMetadataAddF32(meta, PS_LIST_TAIL, name, 0, "", strtof(content, NULL)); break; case PS_DATA_F64: @@ -360,9 +360,9 @@ strncpy(content, (const char*)cur_node->properties->next->next->children->content, MAXSTR); - psMetadataAddF64(meta, PS_LIST_TAIL, name, "", strtod(content, NULL)); + psMetadataAddF64(meta, PS_LIST_TAIL, name, 0, "", strtod(content, NULL)); break; case PS_DATA_STRING: strncpy(name, (const char*)cur_node->properties->children->content, MAXSTR); - psMetadataAddStr(meta, PS_LIST_TAIL, name, "", + psMetadataAddStr(meta, PS_LIST_TAIL, name, 0, "", (const char*)cur_node->properties->next->next->children->content); break; @@ -382,5 +382,5 @@ psVector *vec = psVectorAlloc(strlen(content), elemType); storeValues(vec, content, elemType); - psMetadataAddVector(meta, PS_LIST_TAIL, name, "", vec); + psMetadataAddVector(meta, PS_LIST_TAIL, name, 0, "", vec); psFree(vec); break; @@ -390,5 +390,5 @@ psMetadata *temp = NULL; temp = xml2metadata(cur_node->children, nodeNum); - psMetadataAddMetadata(meta, PS_LIST_TAIL, name, "", temp); + psMetadataAddMetadata(meta, PS_LIST_TAIL, name, 0, "", temp); psFree(temp); break; @@ -401,10 +401,10 @@ !strncmp(content, "T", MAXSTR) || !strncmp(content, "t", MAXSTR) ) { - psMetadataAddBool(meta, PS_LIST_TAIL, name, "", true); + psMetadataAddBool(meta, PS_LIST_TAIL, name, 0, "", true); } else if ( !strncmp(content, "false", MAXSTR) || !strncmp(content, "FALSE", MAXSTR) || !strncmp(content, "F", MAXSTR) || !strncmp(content, "f", MAXSTR) ) { - psMetadataAddBool(meta, PS_LIST_TAIL, name, "", false); + psMetadataAddBool(meta, PS_LIST_TAIL, name, 0, "", false); } else { psError(PS_ERR_BAD_PARAMETER_VALUE, true, Index: /trunk/psLib/test/fits/tst_psFits.c =================================================================== --- /trunk/psLib/test/fits/tst_psFits.c (revision 4890) +++ /trunk/psLib/test/fits/tst_psFits.c (revision 4891) @@ -6,6 +6,6 @@ * @author Robert DeSonia, 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-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1137,7 +1137,7 @@ for (int row = 0; row < tableNumRows+1; row++) { psMetadata* md = psMetadataAlloc(); - psMetadataAddF32(md,PS_LIST_TAIL,"MYFLT","",(float)row/-10.0); - psMetadataAddF64(md,PS_LIST_TAIL,"MYDBL","",(double)row/-100.0); - psMetadataAddS32(md,PS_LIST_TAIL,"MYINT","",-row); + psMetadataAddF32(md,PS_LIST_TAIL,"MYFLT", 0,"",(float)row/-10.0); + psMetadataAddF64(md,PS_LIST_TAIL,"MYDBL", 0,"",(double)row/-100.0); + psMetadataAddS32(md,PS_LIST_TAIL,"MYINT", 0,"",-row); if (! psFitsUpdateTable(fits,md,row)) { @@ -1174,5 +1174,5 @@ psMetadata* md = psMetadataAlloc(); - psMetadataAddF32(md,PS_LIST_TAIL,"BOGUS","",-1.0f); + psMetadataAddF32(md,PS_LIST_TAIL,"BOGUS", 0,"",-1.0f); psWarning("Following should be a warning."); psErrorClear(); @@ -1185,7 +1185,7 @@ md = psMetadataAlloc(); - psMetadataAddF32(md,PS_LIST_TAIL,"MYFLT","",-1.0f); - psMetadataAddF64(md,PS_LIST_TAIL,"MYDBL","",-2.0); - psMetadataAddS32(md,PS_LIST_TAIL,"MYINT","",-3); + psMetadataAddF32(md,PS_LIST_TAIL,"MYFLT", 0,"",-1.0f); + psMetadataAddF64(md,PS_LIST_TAIL,"MYDBL", 0,"",-2.0); + psMetadataAddS32(md,PS_LIST_TAIL,"MYINT", 0,"",-3); psWarning("Following should be an error."); Index: /trunk/psLib/test/types/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadataIO.c (revision 4890) +++ /trunk/psLib/test/types/tst_psMetadataIO.c (revision 4891) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-24 22:00:57 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -245,9 +245,9 @@ md = psMetadataAlloc(); - psMetadataAddBool(md, PS_LIST_TAIL, "item1", "I am a boolean", true); - psMetadataAddS32(md, PS_LIST_TAIL, "item2", "I am a integer", 55); - psMetadataAddF32(md, PS_LIST_TAIL, "item3", "I am a float", 3.14); - psMetadataAddF64(md, PS_LIST_TAIL, "item4", "I am a double", 6.28); - psMetadataAddStr(md, PS_LIST_TAIL, "item5", "I am a string", "GNIRTS"); + psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true); + psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55); + psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14); + psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28); + psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS"); return md; Index: /trunk/psLib/test/types/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_04.c (revision 4890) +++ /trunk/psLib/test/types/tst_psMetadata_04.c (revision 4891) @@ -25,6 +25,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-24 23:06:48 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -92,5 +92,5 @@ newMD = psMetadataAlloc(); strncpy(string, "String was here", 50); - psMetadataAddF64(newMD, PS_LIST_HEAD, "yourItem1", "I am a psF64", 4.14); + 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); Index: /trunk/psLib/test/types/tst_psMetadata_07.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_07.c (revision 4890) +++ /trunk/psLib/test/types/tst_psMetadata_07.c (revision 4891) @@ -12,6 +12,6 @@ * @author David Robbins, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-24 22:00:57 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-08-27 01:33:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -46,21 +46,21 @@ vec->data.S32[i] = i+1; } - psMetadataAddBool(md, PS_LIST_TAIL, "item1", "I am a boolean", true); - psMetadataAddS32(md, PS_LIST_TAIL, "item2", "I am a integer", 55); - psMetadataAddF32(md, PS_LIST_TAIL, "item3", "I am a float", 3.14); - psMetadataAddF64(md, PS_LIST_TAIL, "item4", "I am a double", 6.28); - psMetadataAddStr(md, PS_LIST_TAIL, "item5", "I am a string", "GNIRTS"); - psMetadataAddVector(md, PS_LIST_TAIL, "vector6", "I am a vector", vec); + psMetadataAddBool(md, PS_LIST_TAIL, "item1", 0, "I am a boolean", true); + psMetadataAddS32(md, PS_LIST_TAIL, "item2", 0, "I am a integer", 55); + psMetadataAddF32(md, PS_LIST_TAIL, "item3", 0, "I am a float", 3.14); + psMetadataAddF64(md, PS_LIST_TAIL, "item4", 0, "I am a double", 6.28); + psMetadataAddStr(md, PS_LIST_TAIL, "item5", 0, "I am a string", "GNIRTS"); + psMetadataAddVector(md, PS_LIST_TAIL, "vector6", 0, "I am a vector", vec); - psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", "I AM INT", 666); + psMetadataAddS32(newMD, PS_LIST_TAIL, "ITEM01", 0, "I AM INT", 666); psMetadata *newestMD = NULL; newestMD = psMetadataAlloc(); - psMetadataAddVector(newestMD, PS_LIST_TAIL, "VECTORNEW", "Newest VECTOR", vec); - psMetadataAddStr(newestMD, PS_LIST_TAIL, "cell", "I am a p-Star", "pStArRs"); - psMetadataAddMetadata(newMD, PS_LIST_TAIL, "META NEW", "I AM Newest METADATA", newestMD); - psMetadataAddF32(newMD, PS_LIST_TAIL, "ITEM02", "I AM FLOAT", 666.6); - psMetadataAddF64(newMD, PS_LIST_TAIL, "ITEM03", "I AM DOUBLE", 666.666); + psMetadataAddVector(newestMD, PS_LIST_TAIL, "VECTORNEW", 0, "Newest VECTOR", vec); + psMetadataAddStr(newestMD, PS_LIST_TAIL, "cell", 0, "I am a p-Star", "pStArRs"); + psMetadataAddMetadata(newMD, PS_LIST_TAIL, "META NEW", 0, "I AM Newest METADATA", newestMD); + psMetadataAddF32(newMD, PS_LIST_TAIL, "ITEM02", 0, "I AM FLOAT", 666.6); + psMetadataAddF64(newMD, PS_LIST_TAIL, "ITEM03", 0, "I AM DOUBLE", 666.666); - psMetadataAddMetadata(md, PS_LIST_TAIL, "metadata7", "I am a metadata", newMD); + psMetadataAddMetadata(md, PS_LIST_TAIL, "metadata7", 0, "I am a metadata", newMD); psFree(newestMD);