Changeset 6190 for trunk/psLib/src/types

Timestamp:

Jan 25, 2006, 12:18:00 PM (21 years ago)

Author:

drobbin

Message:

fixed ConfigFormat, Write. Added extra error checks. Updated/expanded corresponding tests.

File:

• trunk/psLib/src/types/psMetadataConfig.c (modified) (7 diffs)

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @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 +1221 @@
 }
 
+
+/*
 psString psMetadataConfigFormat(psMetadata *md)
 {
     PS_ASSERT_PTR_NON_NULL(md, NULL);
-
+ 
     psString newString = NULL;
     psString newStr = NULL;
@@ -1238 +1240 @@
     strcpy(content, "\0");
     strcpy(mdString, "\0");
-
+ 
     while ( (item = psMetadataGetAndIncrement(iter)) ) {
         type = item->type;
@@ -1256 +1258 @@
             type = PS_DATA_UNKNOWN;
         }
-
+ 
         switch (type) {
         case PS_DATA_BOOL:
@@ -1343 +1345 @@
             snprintf(content, MAXSTR, "\n%s  METADATA  ", item->name);
             strncat(mdString, content, MAXSTR);
-
+ 
             newStr = psMetadataConfigFormat(item->data.md);
             strncpy(buffer, (char *)newStr, MAXSTR);
@@ -1379 +1381 @@
             }
             strncat(mdString, content, MAXSTR);
-
+ 
             snprintf(content, MAXSTR, "%ld, ", (long)((psTime*)(item->data.V))->sec);
             strncat(mdString, content, MAXSTR);
@@ -1465 +1467 @@
     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);