Index: trunk/psLib/test/astronomy/tst_psAstrometry.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psAstrometry.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psAstrometry.c	(revision 3341)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-28 23:34:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -53,5 +53,4 @@
     psExposure* exp = psExposureAlloc(1.0, 2.0, 3.0, 4.0, 5.0,
                                       now, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, obs);
-
 
     if (fabs(exp->ra - 1.0) > DBL_EPSILON) {
Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 3341)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -66,5 +66,4 @@
 {
     printf("%sKey Name: %8s  ", spaces, metadataItem->name);
-    printf("Key pType: %d  ", metadataItem->pType);
     printf("Key mdType: %d  ", metadataItem->type);
 
@@ -73,21 +72,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 3341)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.21 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72,5 +72,4 @@
 {
     printf("%sKey Name: %8s  ", spaces, metadataItem->name);
-    printf("Key pType: %d  ", metadataItem->pType);
     printf("Key mdType: %d  ", metadataItem->type);
 
@@ -79,21 +78,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 3341)
@@ -14,6 +14,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28,5 +28,4 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key pType: %2d  ", metadataItem->pType);
     printf("Key mdType: %2d  ", metadataItem->type);
 
@@ -35,21 +34,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
@@ -76,9 +69,9 @@
     // Test A - Allocate metadata items
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
-    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
-    item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 111);
-    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_F32, PS_META_PRIMITIVE, "I am a single precision floating point", 222.222);
-    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double precision floating point", 333.333);
-    item5 = psMetadataItemAlloc("myItem5", PS_TYPE_PTR, PS_META_STR, "I am a string", "HELLO WORLD");
+    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
+    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 111);
+    item3 = psMetadataItemAlloc("myItem3", PS_META_F32, "I am a single precision floating point", 222.222);
+    item4 = psMetadataItemAlloc("myItem4", PS_META_F64, "I am a double precision floating point", 333.333);
+    item5 = psMetadataItemAlloc("myItem5", PS_META_STR, "I am a string", "HELLO WORLD");
     printMetadataItem(item1);
     printMetadataItem(item2);
@@ -93,5 +86,5 @@
                             "Null value for name not allowed", 0);
     psLogMsg(__func__,PS_LOG_INFO,"Following should produce error for null name.");
-    badItem = psMetadataItemAlloc(NULL, PS_TYPE_PTR, PS_META_STR, "I am a string", "HELLO WORLD");
+    badItem = psMetadataItemAlloc(NULL, PS_META_STR, "I am a string", "HELLO WORLD");
     if (badItem != NULL) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataItemAlloc did not return null with null name item.");
@@ -104,5 +97,5 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type",
                             "Invalid psMetadataType: 6", 0);
-    badItem = psMetadataItemAlloc("badItem", PS_TYPE_PTR, PS_META_NTYPE, "I am bad", "Bad comment");
+    badItem = psMetadataItemAlloc("badItem", PS_META_NTYPE, "I am bad", "Bad comment");
     printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true);
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 3341)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32,5 +32,4 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key pType: %2d  ", metadataItem->pType);
     printf("Key mdType: %2d  ", metadataItem->type);
 
@@ -39,21 +38,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
@@ -83,9 +76,9 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
     metadata = psMetadataAlloc();
-    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
-    item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
-    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
-    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
-    errItem = psMetadataItemAlloc("errItem", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 99);
+    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
+    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
+    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
+    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
+    errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99);
     printMetadataItem(item1);
     printMetadataItem(item2);
@@ -101,5 +94,5 @@
         return 10;
     }
-    if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am S32 integer",77)) {
+    if(!psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2", PS_META_S32, "I am S32 integer",77)) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by name.");
         return 11;
@@ -122,5 +115,5 @@
         return 14;
     }
-    if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am S32 integer",88) ) {
+    if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4", PS_META_S32, "I am S32 integer",88) ) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return true when adding by index.");
         return 15;
@@ -217,5 +210,5 @@
     mdTable = errMetadata->table;
     errMetadata->table = NULL;
-    if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_TYPE_S32, PS_META_PRIMITIVE, "Integer",22) ) {
+    if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
         return 24;
Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 3341)
@@ -23,6 +23,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,4 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key pType: %2d  ", metadataItem->pType);
     printf("Key mdType: %2d  ", metadataItem->type);
 
@@ -44,21 +43,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
@@ -91,10 +84,10 @@
     psVector *vec = psVectorAlloc(5, PS_TYPE_S32);
     metadata = psMetadataAlloc();
-    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
-    item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
-    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
-    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
-    item5 = psMetadataItemAlloc("myItem5", PS_TYPE_F64, PS_META_PRIMITIVE, "I am a double", 3.14);
-    item6 = psMetadataItemAlloc("myItem6", PS_TYPE_PTR, PS_META_VEC, "I am a vector", vec);
+    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
+    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
+    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
+    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
+    item5 = psMetadataItemAlloc("myItem5", PS_META_F64, "I am a double", 3.14);
+    item6 = psMetadataItemAlloc("myItem6", PS_META_VEC, "I am a vector", vec);
     printMetadataItem(item1);
     printMetadataItem(item2);
@@ -108,4 +101,5 @@
     psMetadataAddItem(metadata, item5, PS_LIST_HEAD);
     psMetadataAddItem(metadata, item6, PS_LIST_HEAD);
+    psFree(vec);
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 3341)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.19 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.20 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36,5 +36,4 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key pType: %2d  ", metadataItem->pType);
     printf("Key mdType: %2d  ", metadataItem->type);
 
@@ -43,21 +42,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
@@ -87,11 +80,11 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata items");
     metadata = psMetadataAlloc();
-    item1 = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
-    item2 = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 55);
-    item3 = psMetadataItemAlloc("myItem3", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", false);
-    item4 = psMetadataItemAlloc("myItem4", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a integer", 66);
-    item5 = psMetadataItemAlloc("myItem5", PS_TYPE_F32, PS_META_PRIMITIVE, "I am a float", 3.14);
-    item6 = psMetadataItemAlloc("myItem6", PS_TYPE_F64, PS_META_PRIMITIVE,"I am a double", 6.28);
-    item7 = psMetadataItemAlloc("myItem7", PS_TYPE_PTR, PS_META_STR, "I am a string", "GNIRTS");
+    item1 = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
+    item2 = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a integer", 55);
+    item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false);
+    item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66);
+    item5 = psMetadataItemAlloc("myItem5", PS_META_F32, "I am a float", 3.14);
+    item6 = psMetadataItemAlloc("myItem6", PS_META_F64,"I am a double", 6.28);
+    item7 = psMetadataItemAlloc("myItem7", PS_META_STR, "I am a string", "GNIRTS");
     //    item8 = psMetadataItemAlloc("myItem8", PS_TYPE_PTR, PS_META_UNKNOWN, "I am unknown");
     printMetadataItem(item1);
Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 3341)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27,5 +27,4 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key pType: %2d  ", metadataItem->pType);
     printf("Key mdType: %2d  ", metadataItem->type);
 
@@ -34,21 +33,15 @@
         printf("Key Value: %17c", ' ');
         break;
-    case PS_META_PRIMITIVE:
-        switch(metadataItem->pType) {
-        case PS_TYPE_BOOL:
-            printf("Key Value: %15d  ", metadataItem->data.B);
-            break;
-        case PS_TYPE_S32:
-            printf("Key Value: %15d  ", metadataItem->data.S32);
-            break;
-        case PS_TYPE_F32:
-            printf("Key Value: %15.3f  ", metadataItem->data.F32);
-            break;
-        case PS_TYPE_F64:
-            printf("Key Value: %15.3f  ", metadataItem->data.F64);
-            break;
-        default:
-            printf("Bad type: %d ", metadataItem->pType);
-        }
+    case PS_META_BOOL:
+        printf("Key Value: %15d  ", metadataItem->data.B);
+        break;
+    case PS_META_S32:
+        printf("Key Value: %15d  ", metadataItem->data.S32);
+        break;
+    case PS_META_F32:
+        printf("Key Value: %15.3f  ", metadataItem->data.F32);
+        break;
+    case PS_META_F64:
+        printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
     case PS_META_STR:
@@ -74,9 +67,9 @@
     // Test A - Allocate metadata and items
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Allocate metadata and items");
-    item1a = psMetadataItemAlloc("myItem1", PS_TYPE_BOOL, PS_META_PRIMITIVE, "I am a boolean", true);
-    item1b = psMetadataItemAlloc("myItem1", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 111);
-    item1c = psMetadataItemAlloc("myItem1", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 222);
-    item2a = psMetadataItemAlloc("myItem2", PS_TYPE_S32, PS_META_PRIMITIVE, "I am a signed integer", 333);
-    item2b = psMetadataItemAlloc("myItem2", PS_TYPE_PTR, PS_META_LIST, "I am a folder node", NULL);
+    item1a = psMetadataItemAlloc("myItem1", PS_META_BOOL, "I am a boolean", true);
+    item1b = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 111);
+    item1c = psMetadataItemAlloc("myItem1", PS_META_S32, "I am a signed integer", 222);
+    item2a = psMetadataItemAlloc("myItem2", PS_META_S32, "I am a signed integer", 333);
+    item2b = psMetadataItemAlloc("myItem2", PS_META_LIST, "I am a folder node", NULL);
     metadata = psMetadataAlloc();
     printMetadataItem(item1a);
Index: trunk/psLib/test/astronomy/tst_psMetadata_07.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_07.c	(revision 3333)
+++ trunk/psLib/test/astronomy/tst_psMetadata_07.c	(revision 3341)
@@ -9,6 +9,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.8 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-02-17 19:26:24 $
+*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30,7 +30,7 @@
         printf("psMetadataParseConfigXml returned error %d\n", res);
     }
+
     psFree(md);
     printFooter(stdout, "psMetadata", "Test A - Read an XML config file", true);
-
 
     // Test B - Free data
Index: trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout	(revision 3341)
@@ -7,41 +7,41 @@
 Failed lines: 6 Expected: 6
 Contents of metadata list:
- Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key pType: 4865  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
- Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
+ Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
+ Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
- Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key pType: 4865  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
- Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
- Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
+ Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
+ Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
+ Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read config file with overwrite set true} | tst_psMetadataIO.c)
@@ -54,41 +54,41 @@
 
 Failed lines: 7 Expected: 7 Contents of metadata list:
- Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key pType: 4865  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
- Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          55.550  Key Comment: 
+ Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
+ Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key mdType: 1  Key Value:          55.550  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
- Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key pType: 4865  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
- Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          55.550  Key Comment: 
- Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
+ Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
+ Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key mdType: 1  Key Value:          55.550  Key Comment: 
+ Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read config file with overwrite set false} | tst_psMetadataIO.c)
@@ -101,41 +101,41 @@
 
 Failed lines: 6 Expected: 6 Contents of metadata list:
- Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key pType: 4865  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
- Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
- Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
+ Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
+ Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
+ Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key pType: 0  Key mdType: 2  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key pType: 0  Key mdType: 2  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key pType: 1028  Key mdType: 0  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: 
- Key Name:       pi  Key pType: 1032  Key mdType: 0  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key pType: 4865  Key mdType: 0  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key pType: 260  Key mdType: 3  Bad type: 3 Key Comment: These are prime numbers
- Key Name: altitude  Key pType: 260  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key pType: 1028  Key mdType: 0  Key Value:          66.660  Key Comment: 
- Key Name:   title1  Key pType: 0  Key mdType: 2  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
+    Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
+ Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
+ Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
+ Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read config file without auto-allocation of metadata} | tst_psMetadataIO.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 3341)
@@ -6,14 +6,14 @@
 
 Contents of metadata list:
- Key Name:   SIMPLE  Key pType: 4865  Key mdType: 0  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:   SIMPLE  Key mdType: 3  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
- Key Name:   SIMPLE  Key pType: 4865  Key mdType: 0  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
+ Key Name:   SIMPLE  Key mdType: 3  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
@@ -26,32 +26,32 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_1'  Key Comment: 
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
-    Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+    Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  HISTORY  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_1'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -64,25 +64,25 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -97,25 +97,25 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key pType: 260  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key pType: 260  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key pType: 0  Key mdType: 2  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key pType: 260  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key pType: 260  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key pType: 0  Key mdType: 1  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key pType: 0  Key mdType: 2  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key pType: 0  Key mdType: 2  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key mdType: 4  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3341)
@@ -4,5 +4,5 @@
     Unallowable operation: name is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
-    Specified psMetadataType, 11, is not supported.
+    Specified psMetadataType, 14, is not supported.
 <DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 3341)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key pType: 4865  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
-Key Name:  myItem3  Key pType: 1028  Key mdType:  0  Key Value:         222.222  Key Comment: I am a single precision floating point
-Key Name:  myItem4  Key pType: 1032  Key mdType:  0  Key Value:         333.333  Key Comment: I am a double precision floating point
-Key Name:  myItem5  Key pType:  0  Key mdType:  2  Key Value:     HELLO WORLD  Key Comment: I am a string
+Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem3  Key mdType:  1  Key Value:         222.222  Key Comment: I am a single precision floating point
+Key Name:  myItem4  Key mdType:  2  Key Value:         333.333  Key Comment: I am a double precision floating point
+Key Name:  myItem5  Key mdType:  5  Key Value:     HELLO WORLD  Key Comment: I am a string
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_02.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout	(revision 3341)
@@ -5,8 +5,8 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key pType: 4865  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key pType: 4865  Key mdType:  0  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key pType: 260  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key mdType:  3  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_03.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout	(revision 3341)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key pType: 4865  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key pType: 4865  Key mdType:  0  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key pType: 260  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
-Key Name:  myItem5  Key pType: 1032  Key mdType:  0  Key Value:           3.140  Key Comment: I am a double
+Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key mdType:  3  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem5  Key mdType:  2  Key Value:           3.140  Key Comment: I am a double
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_04.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout	(revision 3341)
@@ -5,8 +5,8 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key pType: 4865  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key pType: 4865  Key mdType:  0  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key pType: 260  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key mdType:  3  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_05.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout	(revision 3333)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout	(revision 3341)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key pType: 4865  Key mdType:  0  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem1  Key pType: 260  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
-Key Name:  myItem1  Key pType: 260  Key mdType:  0  Key Value:             222  Key Comment: I am a signed integer
-Key Name:  myItem2  Key pType: 260  Key mdType:  0  Key Value:             333  Key Comment: I am a signed integer
-Key Name:  myItem2  Key pType:  0  Key mdType:  1  Key Value:                  Key Comment: I am a folder node
+Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem1  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem1  Key mdType:  0  Key Value:             222  Key Comment: I am a signed integer
+Key Name:  myItem2  Key mdType:  0  Key Value:             333  Key Comment: I am a signed integer
+Key Name:  myItem2  Key mdType:  4  Key Value:                  Key Comment: I am a folder node
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata and items} | tst_psMetadata_06.c)