Index: /trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.c (revision 6189) +++ /trunk/psLib/src/types/psMetadataConfig.c (revision 6190) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-25 03:02:47 $ +* @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-25 22:18:00 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1221,8 +1221,10 @@ } + +/* psString psMetadataConfigFormat(psMetadata *md) { PS_ASSERT_PTR_NON_NULL(md, NULL); - + psString newString = NULL; psString newStr = NULL; @@ -1238,5 +1240,5 @@ strcpy(content, "\0"); strcpy(mdString, "\0"); - + while ( (item = psMetadataGetAndIncrement(iter)) ) { type = item->type; @@ -1256,5 +1258,5 @@ type = PS_DATA_UNKNOWN; } - + switch (type) { case PS_DATA_BOOL: @@ -1343,5 +1345,5 @@ snprintf(content, MAXSTR, "\n%s METADATA ", item->name); strncat(mdString, content, MAXSTR); - + newStr = psMetadataConfigFormat(item->data.md); strncpy(buffer, (char *)newStr, MAXSTR); @@ -1379,5 +1381,5 @@ } strncat(mdString, content, MAXSTR); - + snprintf(content, MAXSTR, "%ld, ", (long)((psTime*)(item->data.V))->sec); strncat(mdString, content, MAXSTR); @@ -1465,12 +1467,190 @@ return newString; } +*/ + +psString psMetadataConfigFormat(psMetadata *md) +{ + PS_ASSERT_PTR_NON_NULL(md, NULL); + + psString mdString = NULL; + psString content = NULL; + + psMetadataItem *item = NULL; + psMetadataIterator *iter = psMetadataIteratorAlloc(md, PS_LIST_HEAD, NULL); + + while ( (item = psMetadataGetAndIncrement(iter)) ) { + if (item == NULL) { + // XXX : this is probably not the right error value + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, PS_DATA_UNKNOWN); + psFree(iter); + return NULL; + } + + // In this block, the single item is used to build 'content' + switch (item->type) { + case PS_DATA_BOOL: + psStringAppend (&content, "%s BOOL ", item->name); + if ( item->data.B ) { + psStringAppend(&content, "TRUE"); + } else { + psStringAppend(&content, "FALSE"); + } + if ( item->comment != NULL ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n", item->comment); + break; + case PS_DATA_S32: + psStringAppend(&content, "%s S32 ", item->name); + psStringAppend(&content, "%d ", item->data.S32); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_F32: + psStringAppend(&content, "%s F32 ", item->name); + psStringAppend(&content, "%.15g ", item->data.F32); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_F64: + psStringAppend(&content, "%s F64 ", item->name); + psStringAppend(&content, "%.15g ", item->data.F64); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_STRING: + psStringAppend(&content, "%s STR ", item->name); + psStringAppend(&content, "%s ", ((char *)(item->data.V))); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_METADATA: + psStringAppend(&content, "\n%s METADATA ", item->name); + psString newStr = psMetadataConfigFormat(item->data.md); + // XXX need to check for NULL return value, implying error + // from a lower level + + // add 3 extra spaces to each metadata folder item + char *buffer2 = strtok(newStr, "\n"); + while( buffer2 != NULL ) { + psStringAppend(&content, "\n %s", buffer2); + buffer2 = strtok(NULL, "\n"); + } + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, "\nEND #%s\n\n", item->comment); + } else { + psStringAppend(&content, "\nEND\n\n"); + } + psFree(newStr); + break; + case PS_DATA_TIME: + psStringAppend(&content, "%s ", item->name); + psTime *time = item->data.V; + if ( time->type == PS_TIME_UTC ) + psStringAppend(&content, "PS_TIME_UTC "); + else if ( time->type == PS_TIME_TAI ) + psStringAppend(&content, "PS_TIME_TAI "); + else if ( time->type == PS_TIME_UT1 ) + psStringAppend(&content, "PS_TIME_UT1 "); + else if ( time->type == PS_TIME_TT ) + psStringAppend(&content, "PS_TIME_TT "); + else { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_METATYPE_INVALID, time->type); + // XXX memory leak: should free content and mdString before returning + psFree(iter); + return NULL; + } + + psStringAppend(&content, "%ld, ", (long)time->sec); + psStringAppend(&content, "%u, ", time->nsec); + if ( time->leapsecond ) + psStringAppend(&content, "T "); + else + psStringAppend(&content, "F "); + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_VECTOR: + psStringAppend(&content, "@%s ", item->name); + psVector *vector = item->data.V; + + switch (vector->type.type) { + case PS_DATA_S32: + psStringAppend(&content, "S32 "); + for (int i = 0; i < vector->n; i++) { + psStringAppend(&content, "%d ", vector->data.S32[i]); + } + break; + case PS_DATA_F32: + psStringAppend(&content, "F32 ", MAXSTR); + for (int i = 0; i < vector->n; i++) { + psStringAppend(&content, "%.15g ", vector->data.F32[i]); + } + break; + case PS_DATA_F64: + psStringAppend(&content, "F64 ", MAXSTR); + for (int i = 0; i < vector->n; i++) { + psStringAppend(&content, "%.15g", vector->data.F64[i]); + } + break; + case PS_DATA_UNKNOWN: + default: + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psMetadata_METATYPE_INVALID, vector->type.type); + psFree(iter); + // XXX memory leak: should free content and mdString before returning + return NULL; + } + if ( strncmp(item->comment,"",2) ) { + psStringAppend(&content, " #%s", item->comment); + } + psStringAppend(&content, " \n"); + break; + case PS_DATA_UNKNOWN: + default: + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + PS_ERRORTEXT_psMetadata_METATYPE_INVALID, item->type); + psFree(iter); + // XXX memory leak: should free content and mdString before returning + return NULL; + } + psStringAppend(&mdString, content); + psFree(content); + content = NULL; + } + psFree(iter); + return mdString; +} + bool psMetadataConfigWrite(psMetadata *md, const char *filename) { + PS_ASSERT_PTR_NON_NULL(md, NULL); + PS_ASSERT_PTR_NON_NULL(filename, NULL); psString fileString = NULL; + fileString = psMetadataConfigFormat(md); + if (fileString == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, false, + "psMetadataConfigFormat returned NULL.\n"); + return false; + } FILE *file; - file = fopen(filename, "w"); - fileString = psMetadataConfigFormat(md); + if ( !(file = fopen(filename, "w")) ) { + psError(PS_ERR_IO, true, + "Failed to open specified file, %s\n", filename); + psFree(fileString); + return false; + } fprintf(file, "%s", fileString); fclose(file); Index: /trunk/psLib/test/types/mdcfgwrt.verified =================================================================== --- /trunk/psLib/test/types/mdcfgwrt.verified (revision 6190) +++ /trunk/psLib/test/types/mdcfgwrt.verified (revision 6190) @@ -0,0 +1,18 @@ +item1 BOOL TRUE #I am a boolean +item2 S32 55 +item3 F32 3.14000010490417 +item4 F64 6.28 +item5 STR GNIRTS #I am a string +@vector6 S32 1 2 3 4 5 #I am a vector +time01 PS_TIME_TAI 1000, 25, T #I am time + +metadata7 METADATA + ITEM01 S32 666 + META NEW METADATA + @VECTORNEW S32 1 2 3 4 5 #Newest VECTOR + cell STR pStArRs #I am a p-Star + END #I AM Newest METADATA + ITEM02 F32 666.599975585938 #I AM FLOAT + ITEM03 F64 666.666 #I AM DOUBLE +END #I am a metadata + Index: /trunk/psLib/test/types/tst_psMetadata_07.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_07.c (revision 6189) +++ /trunk/psLib/test/types/tst_psMetadata_07.c (revision 6190) @@ -16,6 +16,6 @@ * @author David Robbins, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-23 23:52:15 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-25 22:18:00 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -58,4 +58,5 @@ vec->data.S32[i] = i+1; } + vec->n = 5; time->sec = 1000; time->nsec = 25; @@ -137,11 +138,59 @@ { psMetadata *newMD = NULL; + //Return false for NULL input metadata + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + if (psMetadataConfigWrite(newMD, "mdcfgwrt.out")) { + psError(PS_ERR_BAD_PARAMETER_NULL, false, + "psMetadataConfigWrite failed to return false for NULL input metadata.\n"); + return 1; + } newMD = setupMeta(); - printPositiveTestHeader(stdout, "psMetadata", "Test E - psMetadataConfigWrite"); + //Return false for NULL input filename + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + if (psMetadataConfigWrite(newMD, NULL)) { + psError(PS_ERR_BAD_PARAMETER_NULL, false, + "psMetadataConfigWrite failed to return false for NULL input filename.\n"); + return 2; + } + //Return false for bad input filename + psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); + if (psMetadataConfigWrite(newMD, "temp")) { + psError(PS_ERR_BAD_PARAMETER_NULL, false, + "psMetadataConfigWrite failed to return false for bad input filename.\n"); + return 3; + } + //Return true for valid inputs if ( !psMetadataConfigWrite(newMD, "mdcfgwrt.out") ) { fprintf(stderr, "Failed test point E - Failed to write metadata to file. \n"); - } - - printFooter(stdout, "psMetadata", "Test E - psMetadataConfigWrite", true); + return 4; + } + + //Make sure the output file matches the verified file output. + FILE *verified; + FILE *output; + verified = fopen("mdcfgwrt.verified", "r"); + output = fopen("mdcfgwrt.out", "r"); + char buffer1[100]; + char buffer2[100]; + while ( fscanf(verified, "%s", buffer1) != EOF ) { + if (fscanf(output, "%s", buffer2) == EOF) { + psError(PS_ERR_BAD_PARAMETER_SIZE, false, + "Output file is smaller than the expected output file.\n"); + return 5; + } + if (strncmp(buffer1, buffer2, 100) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Output file contents do not match the expected output.\n"); + return 6; + } + } + if (fscanf(output, "%s", buffer2) != EOF) { + psError(PS_ERR_BAD_PARAMETER_SIZE, false, + "Output file is larger than the expected output file.\n"); + return 7; + } + fclose(verified); + fclose(output); + psFree(newMD); return 0; Index: /trunk/psLib/test/types/verified/tst_psMetadata_07.stderr =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_07.stderr (revision 6189) +++ /trunk/psLib/test/types/verified/tst_psMetadata_07.stderr (revision 6190) @@ -14,4 +14,16 @@ \**********************************************************************************/ +