Index: trunk/psLib/test/collections/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_02.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_03.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_04.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_05.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_06.c	(revision 3289)
+++ trunk/psLib/test/collections/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/collections/tst_psMetadata_07.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_07.c	(revision 3289)
+++ trunk/psLib/test/collections/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
