Index: /trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.c	(revision 8777)
+++ /trunk/psLib/src/types/psMetadataConfig.c	(revision 8778)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-09-08 02:59:29 $
+*  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-09-08 03:42:24 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1300,8 +1300,8 @@
 
     #define FORMAT_PRIMITIVE_METADATAITEM(type, dataformat) \
-    psStringAppend(&content, "%-15s  %-8s", item->name, #type); \
-    psStringAppend(&content, "  " dataformat, item->data.type); \
-    if ( strncmp(item->comment,"",2) ) { \
-        psStringAppend(&content, " #%s\n", item->comment); \
+    psStringAppend(&content, "%-15s  %-8s  %-15" dataformat, \
+                   item->name, #type, item->data.type); \
+    if (item->comment && strncmp(item->comment, "", 2)) { \
+        psStringAppend(&content, "  #%s", item->comment); \
     } \
     psStringAppend(&content, "\n");
@@ -1329,46 +1329,46 @@
         break;
     case PS_DATA_BOOL:
-        psStringAppend (&content, "%-15s  %-8s", item->name, "BOOL");
-        psStringAppend(&content, "  %s", item->data.B ? "T" : "F");
-        if (strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s\n", item->comment);
+        psStringAppend (&content, "%-15s  %-8s  -%15s",
+                        item->name, "BOOL", item->data.B ? "T" : "F");
+        if (item->comment && strncmp(item->comment, "", 2)) {
+            psStringAppend(&content, "  #%s", item->comment);
         }
         psStringAppend(&content, "\n");
         break;
     case PS_DATA_S8:
-        FORMAT_PRIMITIVE_METADATAITEM(S8, "%d");
+        FORMAT_PRIMITIVE_METADATAITEM(S8, "d");
         break;
     case PS_DATA_S16:
-        FORMAT_PRIMITIVE_METADATAITEM(S16, "%d");
+        FORMAT_PRIMITIVE_METADATAITEM(S16, "d");
         break;
     case PS_DATA_S32:
-        FORMAT_PRIMITIVE_METADATAITEM(S32, "%d");
+        FORMAT_PRIMITIVE_METADATAITEM(S32, "d");
         break;
     case PS_DATA_S64:
-        FORMAT_PRIMITIVE_METADATAITEM(S64, "%"PRId64);
+        FORMAT_PRIMITIVE_METADATAITEM(S64, PRId64);
         break;
     case PS_DATA_U8:
-        FORMAT_PRIMITIVE_METADATAITEM(U8, "%u");
+        FORMAT_PRIMITIVE_METADATAITEM(U8, "u");
         break;
     case PS_DATA_U16:
-        FORMAT_PRIMITIVE_METADATAITEM(U16, "%u");
+        FORMAT_PRIMITIVE_METADATAITEM(U16, "u");
         break;
     case PS_DATA_U32:
-        FORMAT_PRIMITIVE_METADATAITEM(U32, "%u");
+        FORMAT_PRIMITIVE_METADATAITEM(U32, "u");
         break;
     case PS_DATA_U64:
-        FORMAT_PRIMITIVE_METADATAITEM(U64, "%"PRIu64);
+        FORMAT_PRIMITIVE_METADATAITEM(U64, PRIu64);
         break;
     case PS_DATA_F32:
-        FORMAT_PRIMITIVE_METADATAITEM(F32, "%.7g");
+        FORMAT_PRIMITIVE_METADATAITEM(F32, ".7g");
         break;
     case PS_DATA_F64:
-        FORMAT_PRIMITIVE_METADATAITEM(F64, "%.15g");
+        FORMAT_PRIMITIVE_METADATAITEM(F64, ".15g");
         break;
     case PS_DATA_STRING:
-        psStringAppend(&content, "%-15s  %-8s", item->name, "STR");
-        psStringAppend(&content, "  %s", item->data.str);
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
+        psStringAppend(&content, "%-15s  %-8s  -%15s",
+                       item->name, "STR", item->data.str);
+        if (item->comment && strncmp(item->comment,"",2)) {
+            psStringAppend(&content, "  #%s", item->comment);
         }
         psStringAppend(&content, " \n");
@@ -1394,14 +1394,14 @@
         break;
     case PS_DATA_TIME:
-        psStringAppend(&content, "%s ", item->name);
+        psStringAppend(&content, "%-15s  ", item->name);
         psTime *time = item->data.V;
         if ( time->type == PS_TIME_UTC )
-            psStringAppend(&content, "UTC  ");
+            psStringAppend(&content, "%-8s  ", "UTC");
         else if ( time->type == PS_TIME_TAI )
-            psStringAppend(&content, "TAI  ");
+            psStringAppend(&content, "%-8s  ", "TAI");
         else if ( time->type == PS_TIME_UT1 )
-            psStringAppend(&content, "UT1  ");
+            psStringAppend(&content, "%-8s  ", "UT1");
         else if ( time->type == PS_TIME_TT )
-            psStringAppend(&content, "TT  ");
+            psStringAppend(&content, "%-8s  ", "TT");
         else {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, _("Specified psDataType, %d, is not supported."), time->type);
@@ -1410,12 +1410,10 @@
         }
 
-        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);
+        psString timeStr = psTimeToISO(time);
+        psStringAppend(&content, "%-15s", timeStr);
+        psFree(timeStr);
+
+        if (item->comment && strncmp(item->comment,"",2)) {
+            psStringAppend(&content, "  #%s", item->comment);
         }
         psStringAppend(&content, " \n");
@@ -1493,8 +1491,8 @@
             return NULL;
         }
-        if ( strncmp(item->comment,"",2) ) {
-            psStringAppend(&content, " #%s", item->comment);
-        }
-        psStringAppend(&content, " \n");
+        if (item->comment && strncmp(item->comment,"",2)) {
+            psStringAppend(&content, "  #%s", item->comment);
+        }
+        psStringAppend(&content, "\n");
         break;
     case PS_DATA_UNKNOWN: