Changeset 7013

Timestamp:

Apr 30, 2006, 12:10:38 PM (20 years ago)

Author:

magnier

Message:

added support for S8,S16,U8,U16,U32

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-18 01:21:53 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-30 22:10:38 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -439 +439 @@
             fprintf(fd, format, (FORMAT_TYPE) item->data.B); \
             break; \
+        case PS_DATA_S8: \
+            fprintf(fd,format,(FORMAT_TYPE)  item->data.S8); \
+            break; \
+        case PS_DATA_S16: \
+            fprintf(fd,format,(FORMAT_TYPE)  item->data.S16); \
+            break; \
         case PS_DATA_S32: \
             fprintf(fd,format,(FORMAT_TYPE)  item->data.S32); \
+            break; \
+        case PS_DATA_U8: \
+            fprintf(fd,format,(FORMAT_TYPE)  item->data.U8); \
+            break; \
+        case PS_DATA_U16: \
+            fprintf(fd,format,(FORMAT_TYPE)  item->data.U16); \
+            break; \
+        case PS_DATA_U32: \
+            fprintf(fd,format,(FORMAT_TYPE)  item->data.U32); \
             break; \
         case PS_DATA_F32: \
@@ -1221 +1236 @@
 }
 
-
-/*
+// very dangerous to use comments to block out a very long section...
+# if 0
 psString psMetadataConfigFormat(psMetadata *md)
 {
     PS_ASSERT_PTR_NON_NULL(md, NULL);
- 
+
     psString newString = NULL;
     psString newStr = NULL;
@@ -1240 +1255 @@
     strcpy(content, "\0");
     strcpy(mdString, "\0");
- 
+
     while ( (item = psMetadataGetAndIncrement(iter)) ) {
         type = item->type;
@@ -1258 +1273 @@
             type = PS_DATA_UNKNOWN;
         }
- 
+
         switch (type) {
         case PS_DATA_BOOL:
@@ -1345 +1360 @@
             snprintf(content, MAXSTR, "\n%s  METADATA  ", item->name);
             strncat(mdString, content, MAXSTR);
- 
+
             newStr = psMetadataConfigFormat(item->data.md);
             strncpy(buffer, (char *)newStr, MAXSTR);
@@ -1381 +1396 @@
             }
             strncat(mdString, content, MAXSTR);
- 
+
             snprintf(content, MAXSTR, "%ld, ", (long)((psTime*)(item->data.V))->sec);
             strncat(mdString, content, MAXSTR);
@@ -1467 +1482 @@
     return newString;
 }
-*/
+# endif // old version of psMetadataConfigFormat
 
 psString psMetadataConfigFormat(psMetadata *md)
@@ -1502 +1517 @@
             psStringAppend(&content, " \n", item->comment);
             break;
+        case PS_DATA_S8:
+            psStringAppend(&content, "%s S8  ", item->name);
+            psStringAppend(&content, "%d ", item->data.S8);
+            if ( strncmp(item->comment,"",2) ) {
+                psStringAppend(&content, " #%s", item->comment);
+            }
+            psStringAppend(&content, " \n");
+            break;
+        case PS_DATA_S16:
+            psStringAppend(&content, "%s S16  ", item->name);
+            psStringAppend(&content, "%d ", item->data.S16);
+            if ( strncmp(item->comment,"",2) ) {
+                psStringAppend(&content, " #%s", item->comment);
+            }
+            psStringAppend(&content, " \n");
+            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_U8:
+            psStringAppend(&content, "%s U8  ", item->name);
+            psStringAppend(&content, "%d ", item->data.U8);
+            if ( strncmp(item->comment,"",2) ) {
+                psStringAppend(&content, " #%s", item->comment);
+            }
+            psStringAppend(&content, " \n");
+            break;
+        case PS_DATA_U16:
+            psStringAppend(&content, "%s U16  ", item->name);
+            psStringAppend(&content, "%d ", item->data.U16);
+            if ( strncmp(item->comment,"",2) ) {
+                psStringAppend(&content, " #%s", item->comment);
+            }
+            psStringAppend(&content, " \n");
+            break;
+        case PS_DATA_U32:
+            psStringAppend(&content, "%s U32  ", item->name);
+            psStringAppend(&content, "%d ", item->data.U32);
             if ( strncmp(item->comment,"",2) ) {
                 psStringAppend(&content, " #%s", item->comment);