Changeset 3341 for trunk/psLib/test/collections/tst_psMetadata_04.c

Timestamp:

Feb 28, 2005, 1:34:10 PM (21 years ago)

Author:

desonia

Message:

Changes to psMetadata to match latest SDRS.

File:

• trunk/psLib/test/collections/tst_psMetadata_04.c (modified) (5 diffs)

trunk/psLib/test/collections/tst_psMetadata_04.c

@@ -23 +23 @@
 *  @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 +37 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key pType: %2d  ", metadataItem->pType);
     printf("Key mdType: %2d  ", metadataItem->type);
 
@@ -44 +43 @@
         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 +84 @@
     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 +101 @@
     psMetadataAddItem(metadata, item5, PS_LIST_HEAD);
     psMetadataAddItem(metadata, item6, PS_LIST_HEAD);
+    psFree(vec);
     printFooter(stdout, "psMetadata", "Test A - Allocate metadata items", true);