Index: /trunk/psLib/configure.ac =================================================================== --- /trunk/psLib/configure.ac (revision 3778) +++ /trunk/psLib/configure.ac (revision 3779) @@ -43,5 +43,5 @@ AC_LANG_PUSH(Fortran) -AC_PROG_F77(gfortran g95 g90 g77 f95 f90 f77) +AC_PROG_F77([gfortran g77]) AC_F77_WRAPPERS AC_LANG_POP(Fortran) Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 3778) +++ /trunk/psLib/pslib.kdevses (revision 3779) @@ -2,21 +2,5 @@ - - - - - - - - - - - - - - - - - + Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 3778) +++ /trunk/psLib/src/collections/psMetadata.c (revision 3779) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-23 02:07:27 $ +* @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-28 02:45:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,32 +39,5 @@ #include "psConstants.h" -/******************************************************************************/ -/* DEFINE STATEMENTS */ -/******************************************************************************/ - -/** Maximum size of a string */ -#define MAX_STRING_LENGTH 1024 - -/******************************************************************************/ -/* TYPE DEFINITIONS */ -/******************************************************************************/ - -// None - -/*****************************************************************************/ -/* GLOBAL VARIABLES */ -/*****************************************************************************/ - -// None - -/*****************************************************************************/ -/* FILE STATIC VARIABLES */ -/*****************************************************************************/ - static psS32 metadataId = 0; - -/*****************************************************************************/ -/* FUNCTION IMPLEMENTATION - LOCAL */ -/*****************************************************************************/ static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing) @@ -75,11 +48,11 @@ } - // move any existing entry into a psList - psList* newList = psListAlloc(existing); psMetadataItem* item = psMetadataItemAlloc(key, PS_META_MULTI, - "", - newList); + "List of Metadata Items", + NULL); + + psListAdd(item->data.list,PS_LIST_TAIL,existing); if (existing != NULL) { @@ -87,8 +60,7 @@ } - psHashAdd(table, key, item); // put in the new entry - - // free local references of newly allocated items. - psFree(newList); + psHashAdd(table, key, item); // put in the new MULTI list entry + + // free local references of newly allocated item. psFree(item); @@ -174,5 +146,6 @@ { psMetadataItem* metadataItem = NULL; - + char tmp; + int nBytes; PS_PTR_CHECK_NULL(name,NULL); @@ -185,5 +158,5 @@ psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); - // Allocate and set metadata item comment + // set metadata item comment if (comment == NULL) { // Per SDRS, null isn't allowed, must use "" instead @@ -200,5 +173,6 @@ // Allocate and set metadata item name - metadataItem->name = (char *)psAlloc(sizeof(char) * MAX_STRING_LENGTH); + nBytes = vsnprintf(&tmp, 0, name, argPtr) + 1; + metadataItem->name = (char *)psAlloc(sizeof(char) * nBytes); vsprintf(metadataItem->name, name, argPtr); @@ -219,5 +193,9 @@ case PS_META_STR: // Perform copy of input strings - metadataItem->data.V = psStringNCopy(va_arg(argPtr, char *), MAX_STRING_LENGTH); + metadataItem->data.V = psStringCopy(va_arg(argPtr, char *)); + break; + case PS_META_MULTI: + // MULTI needs to create a psList entry, value must be NULL + metadataItem->data.list = psListAlloc(NULL); break; case PS_META_LIST: @@ -229,5 +207,4 @@ case PS_META_ASTROM: case PS_META_UNKNOWN: - case PS_META_MULTI: // Copy of input data not performed due to variability of data types metadataItem->data.V = psMemIncrRefCounter(va_arg(argPtr, psPtr)); @@ -281,12 +258,19 @@ // See if key is already in table - existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - + existingEntry = psMetadataLookup(md, key); + + // if replace is set, remove any existing items of the same key + if (existingEntry != NULL && (flags & PS_META_REPLACE) != 0) { + psMetadataRemove(md,0,key); + existingEntry = NULL; + } + + // if the metadataItem is MULTI, just add the encapsulated entries if (metadataItem->type == PS_META_MULTI) { - // the incoming entry is PS_META_MULTI - - // force the hash entry to be PS_META_MULTI + + // make sure the existing entry is PS_META_MULTI existingEntry = makeMetaMulti(mdTable,key,existingEntry); + psBool status = true; // add all the items in the incoming entry to metadata psList* list = metadataItem->data.list; @@ -294,53 +278,41 @@ psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); psMetadataItem* listItem; - while ((listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { - psMetadataAddItem(md,listItem,location,flags); + while (status && (listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { + status |= psMetadataAddItem(md,listItem,location,flags); } psFree(iter); } - return true; // all done. + return status; // all done. } // how the item is added to the hash depends on prior existence, flags, etc. - if(existingEntry != NULL) { // prior existence + if(existingEntry == NULL) { // no prior existence + // Node doesn't already exist - Add new metadata item to metadata collection's hash + if(!psHashAdd(mdTable, key, metadataItem)) { + psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); + return false; + } + } else { if (existingEntry->type == PS_META_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 hash entry is PS_META_MULTI existingEntry = makeMetaMulti(mdTable,key,existingEntry); - // add to the hash's list of duplicate entries + // add to the hash key's list of entries if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, metadataItem) ) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); return false; } - } else if ((flags & PS_META_REPLACE) != 0) { - // replace entry instead of creating a duplicate entry. - - // remove the existing entry from metadata - psMetadataRemove(md,0,key); - - // treat as if new (added to list below) - if(!psHashAdd(mdTable, key, metadataItem)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); - return false; - } } else { - // default is to error on duplicate entry. + // error on duplicate entry. psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_DUPLICATE_NOT_ALLOWED); return false; } - } else { - // OK, this is a new item. - - // Node doesn't exist - Add new metadata item to metadata collection's hash - if(!psHashAdd(mdTable, key, metadataItem)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); - return false; - } - } - + } + + // finally, add the metadataItem to the metadata's list. if(!psListAdd(mdList, location, metadataItem)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 3778) +++ /trunk/psLib/src/types/psMetadata.c (revision 3779) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.59 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-23 02:07:27 $ +* @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-28 02:45:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,32 +39,5 @@ #include "psConstants.h" -/******************************************************************************/ -/* DEFINE STATEMENTS */ -/******************************************************************************/ - -/** Maximum size of a string */ -#define MAX_STRING_LENGTH 1024 - -/******************************************************************************/ -/* TYPE DEFINITIONS */ -/******************************************************************************/ - -// None - -/*****************************************************************************/ -/* GLOBAL VARIABLES */ -/*****************************************************************************/ - -// None - -/*****************************************************************************/ -/* FILE STATIC VARIABLES */ -/*****************************************************************************/ - static psS32 metadataId = 0; - -/*****************************************************************************/ -/* FUNCTION IMPLEMENTATION - LOCAL */ -/*****************************************************************************/ static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing) @@ -75,11 +48,11 @@ } - // move any existing entry into a psList - psList* newList = psListAlloc(existing); psMetadataItem* item = psMetadataItemAlloc(key, PS_META_MULTI, - "", - newList); + "List of Metadata Items", + NULL); + + psListAdd(item->data.list,PS_LIST_TAIL,existing); if (existing != NULL) { @@ -87,8 +60,7 @@ } - psHashAdd(table, key, item); // put in the new entry - - // free local references of newly allocated items. - psFree(newList); + psHashAdd(table, key, item); // put in the new MULTI list entry + + // free local references of newly allocated item. psFree(item); @@ -174,5 +146,6 @@ { psMetadataItem* metadataItem = NULL; - + char tmp; + int nBytes; PS_PTR_CHECK_NULL(name,NULL); @@ -185,5 +158,5 @@ psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); - // Allocate and set metadata item comment + // set metadata item comment if (comment == NULL) { // Per SDRS, null isn't allowed, must use "" instead @@ -200,5 +173,6 @@ // Allocate and set metadata item name - metadataItem->name = (char *)psAlloc(sizeof(char) * MAX_STRING_LENGTH); + nBytes = vsnprintf(&tmp, 0, name, argPtr) + 1; + metadataItem->name = (char *)psAlloc(sizeof(char) * nBytes); vsprintf(metadataItem->name, name, argPtr); @@ -219,5 +193,9 @@ case PS_META_STR: // Perform copy of input strings - metadataItem->data.V = psStringNCopy(va_arg(argPtr, char *), MAX_STRING_LENGTH); + metadataItem->data.V = psStringCopy(va_arg(argPtr, char *)); + break; + case PS_META_MULTI: + // MULTI needs to create a psList entry, value must be NULL + metadataItem->data.list = psListAlloc(NULL); break; case PS_META_LIST: @@ -229,5 +207,4 @@ case PS_META_ASTROM: case PS_META_UNKNOWN: - case PS_META_MULTI: // Copy of input data not performed due to variability of data types metadataItem->data.V = psMemIncrRefCounter(va_arg(argPtr, psPtr)); @@ -281,12 +258,19 @@ // See if key is already in table - existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - + existingEntry = psMetadataLookup(md, key); + + // if replace is set, remove any existing items of the same key + if (existingEntry != NULL && (flags & PS_META_REPLACE) != 0) { + psMetadataRemove(md,0,key); + existingEntry = NULL; + } + + // if the metadataItem is MULTI, just add the encapsulated entries if (metadataItem->type == PS_META_MULTI) { - // the incoming entry is PS_META_MULTI - - // force the hash entry to be PS_META_MULTI + + // make sure the existing entry is PS_META_MULTI existingEntry = makeMetaMulti(mdTable,key,existingEntry); + psBool status = true; // add all the items in the incoming entry to metadata psList* list = metadataItem->data.list; @@ -294,53 +278,41 @@ psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); psMetadataItem* listItem; - while ((listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { - psMetadataAddItem(md,listItem,location,flags); + while (status && (listItem=(psMetadataItem*)psListGetAndIncrement(iter)) != NULL) { + status |= psMetadataAddItem(md,listItem,location,flags); } psFree(iter); } - return true; // all done. + return status; // all done. } // how the item is added to the hash depends on prior existence, flags, etc. - if(existingEntry != NULL) { // prior existence + if(existingEntry == NULL) { // no prior existence + // Node doesn't already exist - Add new metadata item to metadata collection's hash + if(!psHashAdd(mdTable, key, metadataItem)) { + psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); + return false; + } + } else { if (existingEntry->type == PS_META_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 hash entry is PS_META_MULTI existingEntry = makeMetaMulti(mdTable,key,existingEntry); - // add to the hash's list of duplicate entries + // add to the hash key's list of entries if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, metadataItem) ) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); return false; } - } else if ((flags & PS_META_REPLACE) != 0) { - // replace entry instead of creating a duplicate entry. - - // remove the existing entry from metadata - psMetadataRemove(md,0,key); - - // treat as if new (added to list below) - if(!psHashAdd(mdTable, key, metadataItem)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); - return false; - } } else { - // default is to error on duplicate entry. + // error on duplicate entry. psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_DUPLICATE_NOT_ALLOWED); return false; } - } else { - // OK, this is a new item. - - // Node doesn't exist - Add new metadata item to metadata collection's hash - if(!psHashAdd(mdTable, key, metadataItem)) { - psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); - return false; - } - } - + } + + // finally, add the metadataItem to the metadata's list. if(!psListAdd(mdList, location, metadataItem)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); Index: /trunk/psLib/test/collections/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 3778) +++ /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 3779) @@ -14,6 +14,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-28 02:45:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -121,5 +121,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false"); psMetadata *metadata2 = NULL; - psS32 failedLines2 = 0; + psU32 failedLines2 = 0; metadata2 = psMetadataParseConfig(metadata2, &failedLines2, "test.config", false); printf("Failed lines: %d Expected: 7 ", failedLines2); @@ -131,5 +131,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata"); psMetadata *metadata3 = psMetadataAlloc(); - psS32 failedLines3 = 0; + psU32 failedLines3 = 0; metadata3 = psMetadataParseConfig(metadata3, &failedLines3, "test.config", true); printf("Failed lines: %d Expected: 6 ", failedLines3); Index: /trunk/psLib/test/collections/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 3778) +++ /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 3779) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ +* @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-28 02:45:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -126,6 +126,4 @@ printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true); - printf("ID=%d\n",(int)psMemGetId()); - // Test B - Read 2nd hdr from complex FITS file @@ -174,6 +172,4 @@ printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true); - printf("ID=%d\n",(int)psMemGetId()); - // Test C - Read named hdr from complex FITS file printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file"); Index: /trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout =================================================================== --- /trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout (revision 3778) +++ /trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout (revision 3779) @@ -26,5 +26,5 @@ Contents of metadata table: - Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: List of Metadata Items Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: @@ -73,5 +73,5 @@ Contents of metadata table: - Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: List of Metadata Items Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: @@ -120,5 +120,5 @@ Contents of metadata table: - Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: comment Key mdType: 0x0001000a Key Value: Key Comment: List of Metadata Items Key Name: comment Key mdType: 0x00010001 Key Value: This Key Comment: Key Name: comment Key mdType: 0x00010001 Key Value: is Key Comment: Index: /trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout =================================================================== --- /trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout (revision 3778) +++ /trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout (revision 3779) @@ -19,5 +19,4 @@ ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c) -ID=34 /***************************** TESTPOINT ******************************************\ * TestFile: tst_psMetadata_01.c * @@ -45,9 +44,9 @@ 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: BITPIX Key mdType: 0x0001000a Key Value: Key Comment: List of Metadata Items 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: 0x0001000a Key Value: Key Comment: List of Metadata Items 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 @@ -58,5 +57,4 @@ ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c) -ID=138 /***************************** TESTPOINT ******************************************\ * TestFile: tst_psMetadata_01.c * @@ -83,5 +81,5 @@ Key Name: GCOUNT Key mdType: 0x00000104 Key Value: 1 Key Comment: required keyword; must = 1 Key Name: BITPIX Key mdType: 0x00000104 Key Value: -64 Key Comment: number of bits per data pixel - Key Name: HISTORY Key mdType: 0x0001000a Key Value: Key Comment: + Key Name: HISTORY Key mdType: 0x0001000a Key Value: Key Comment: List of Metadata Items 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