Changeset 8145

Timestamp:

Aug 4, 2006, 12:51:21 PM (20 years ago)

Author:

jhoblitt

Message:

bug #787 - partially done - columnize primitive types and strings

File:

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

trunk/psLib/src/types/psMetadataConfig.c

@@ -10 +10 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-07-19 02:26:53 $
+*  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-04 22:51:21 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1275 +1275 @@
     psString content = NULL;
 
+    #define FORMAT_PRIMITIVE_METADATAITEM(type, dataformat) \
+    psStringAppend(&content, "%-15s", item->name); \
+    psStringAppend(&content, "  %-8s", #type); \
+    psStringAppend(&content, "  " #dataformat, item->data.type); \
+    if ( strncmp(item->comment,"",2) ) { \
+        psStringAppend(&content, " #%s", item->comment); \
+    } \
+    psStringAppend(&content, " \n");
+
     // In this block, the single item is used to build 'content'
     switch (item->type) {
@@ -1309 +1318 @@
         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");
+        FORMAT_PRIMITIVE_METADATAITEM(S8, %d);
         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");
+        FORMAT_PRIMITIVE_METADATAITEM(S16, %d);
         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");
+        FORMAT_PRIMITIVE_METADATAITEM(S32, %d);
         break;
     case PS_DATA_S64:
-        psStringAppend(&content, "%s S64  ", item->name);
-        psStringAppend(&content, "%ld ", item->data.S64);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        FORMAT_PRIMITIVE_METADATAITEM(S32, %ld);
         break;
     case PS_DATA_U8:
-        psStringAppend(&content, "%s U8  ", item->name);
-        psStringAppend(&content, "%u ", item->data.U8);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        FORMAT_PRIMITIVE_METADATAITEM(U8, %u);
         break;
     case PS_DATA_U16:
-        psStringAppend(&content, "%s U16  ", item->name);
-        psStringAppend(&content, "%u ", item->data.U16);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        FORMAT_PRIMITIVE_METADATAITEM(U16, %u);
         break;
     case PS_DATA_U32:
-        psStringAppend(&content, "%s U32  ", item->name);
-        psStringAppend(&content, "%u ", item->data.U32);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        FORMAT_PRIMITIVE_METADATAITEM(U32, %u);
         break;
     case PS_DATA_U64:
-        psStringAppend(&content, "%s U64  ", item->name);
-        psStringAppend(&content, "%lu ", item->data.U64);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        FORMAT_PRIMITIVE_METADATAITEM(U64, %lu);
         break;
     case PS_DATA_F32:
-        psStringAppend(&content, "%s F32  ", item->name);
-        psStringAppend(&content, "%.7g ", item->data.F32);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        FORMAT_PRIMITIVE_METADATAITEM(F32, %.7g);
         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");
+        FORMAT_PRIMITIVE_METADATAITEM(F64, %.15g);
         break;
     case PS_DATA_STRING:
-        psStringAppend(&content, "%s STR  ", item->name);
-        psStringAppend(&content, "%s ", ((char *)(item->data.V)));
+        psStringAppend(&content, "%-15s", item->name);
+        psStringAppend(&content, "  %-8s",  "STR");
+        psStringAppend(&content, "  %s", ((char *)(item->data.V)));
         if ( strncmp(item->comment,"",2) ) {
             psStringAppend(&content, " #%s", item->comment);