Index: trunk/psLib/test/collections/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 2392)
+++ trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 2607)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-11-22 20:53:39 $
+*  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-12-03 23:19:07 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25,6 +25,17 @@
 
 static void printMetadataItem(psMetadataItem *metadataItem, char *spaces);
+static void printMetadata(psMetadata *metadata);
+static void printMetadataList(psList *metadataItemList, char* spaces);
+static void printMetadataTable(psHash *mdTable);
 
-static void printMetadataItemList(psList *metadataItemList)
+static void printMetadata(psMetadata *metadata)
+{
+    printf("Contents of metadata list:\n");
+    printMetadataList(metadata->list, " ");
+    printf("\nContents of metadata table:\n");
+    printMetadataTable(metadata->table);
+}
+
+static void printMetadataList(psList *metadataItemList, char* spaces)
 {
     psMetadataItem *entryChild = NULL;
@@ -33,69 +44,6 @@
     entryChild = psListGetCurrent(metadataItemList);
     while (entryChild != NULL) {
-        printMetadataItem(entryChild, "    ");
+        printMetadataItem(entryChild, spaces);
         entryChild = psListGetNext(metadataItemList);
-    }
-}
-
-static void printMetadataList(psList *metadataItemList)
-{
-    psMetadataItem *entryChild = NULL;
-
-    psListSetIterator(metadataItemList, PS_LIST_HEAD);
-    entryChild = psListGetCurrent(metadataItemList);
-    while (entryChild != NULL) {
-        printMetadataItem(entryChild, " ");
-        entryChild = psListGetNext(metadataItemList);
-    }
-}
-static void printMetadataItem(psMetadataItem *metadataItem, char *spaces)
-{
-
-    psVector *vec = NULL;
-
-
-    printf("%sKey Name: %8s  ", spaces, metadataItem->name);
-    printf("Key Type: %2d  ", metadataItem->type);
-
-    switch (metadataItem->type ) {
-    case PS_META_ITEM_SET:
-        printf("Key Value: %17c", ' ');
-        break;
-    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:
-        printf("Key Value: %15s  ", (char*)metadataItem->data.V);
-        break;
-    case PS_META_VEC:
-        vec = (psVector*)metadataItem->data.V;
-        printf("Key Value: ");
-        for(psS32 i=0; i<vec->nalloc;i++) {
-            printf("%d ", vec->data.S32[i]);
-        }
-        break;
-    case PS_META_IMG:
-    case PS_META_JPEG:
-    case PS_META_PNG:
-    case PS_META_ASTROM:
-    case PS_META_UNKNOWN:
-        printf("Value: unknown ");
-        break;
-    default:
-        printf("Bad type: %d ", metadataItem->type);
-    }
-    printf("Key Comment: %s\n", metadataItem->comment);
-
-    if(metadataItem->items->size) {
-        printMetadataItemList(metadataItem->items);
     }
 }
@@ -114,10 +62,43 @@
 }
 
-static void printMetadata(psMetadata *metadata)
+static void printMetadataItem(psMetadataItem *metadataItem, char *spaces)
 {
-    printf("\nContents of metadata list:\n");
-    printMetadataList(metadata->list);
-    printf("\nContents of metadata table:\n");
-    printMetadataTable(metadata->table);
+    printf("%sKey Name: %8s  ", spaces, metadataItem->name);
+    printf("Key pType: %d  ", metadataItem->pType);
+    printf("Key mdType: %d  ", metadataItem->type);
+
+    switch (metadataItem->type) {
+    case PS_META_LIST:
+        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);
+        }
+        break;
+    case PS_META_STR:
+        printf("Key Value: %15s  ", (char*)metadataItem->data.V);
+        break;
+    default:
+        printf("Bad type: %d ", metadataItem->type);
+    }
+    printf("Key Comment: %s\n", metadataItem->comment);
+
+    if(metadataItem->data.V && metadataItem->type==PS_META_LIST) {
+        printMetadataList(metadataItem->data.V, "    ");
+    }
 }
 
@@ -128,6 +109,6 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test A - Read config file with overwrite set true");
     psMetadata *metadata1 = NULL;
-    psS32 failedLines1 = 0;
-    failedLines1 = psMetadataParseConfig(&metadata1, "test.config", true);
+    psU32 failedLines1 = 0;
+    metadata1 = psMetadataParseConfig(metadata1, &failedLines1, "test.config", true);
     printf("Failed lines: %d Expected: 6\n", failedLines1);
     printMetadata(metadata1);
@@ -139,6 +120,6 @@
     psMetadata *metadata2 = NULL;
     psS32 failedLines2 = 0;
-    failedLines2 = psMetadataParseConfig(&metadata2, "test.config", false);
-    printf("Failed lines: %d Expected: 7", failedLines2);
+    metadata2 = psMetadataParseConfig(metadata2, &failedLines2, "test.config", false);
+    printf("Failed lines: %d Expected: 7 ", failedLines2);
     printMetadata(metadata2);
     printFooter(stdout, "psMetadata", "Test B - Read config file with overwrite set false", true);
@@ -149,6 +130,6 @@
     psMetadata *metadata3 = psMetadataAlloc();
     psS32 failedLines3 = 0;
-    failedLines3 = psMetadataParseConfig(&metadata3, "test.config", false);
-    printf("Failed lines: %d Expected: 7", failedLines3);
+    metadata3 = psMetadataParseConfig(metadata3, &failedLines3, "test.config", true);
+    printf("Failed lines: %d Expected: 6 ", failedLines3);
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata", true);
@@ -158,5 +139,5 @@
     printNegativeTestHeader(stdout,"psMetadataIO", "Test D - Attempt to use null fileName argument",
                             "Null failedLines not allowed", 0);
-    psMetadataParseConfig(&metadata1, NULL, true);
+    psMetadataParseConfig(metadata1, &failedLines1, NULL, true);
     printFooter(stdout, "psMetadata", "Test D - Attempt to use null fileName argument", true);
 
@@ -165,5 +146,5 @@
     printNegativeTestHeader(stdout,"psMetadataIO", "Test E - Attempt to open nonexistant file",
                             "Error opening file", 0);
-    psMetadataParseConfig(&metadata1, "abcedfg", true);
+    psMetadataParseConfig(metadata1, &failedLines1, "abcedfg", true);
     printFooter(stdout, "psMetadata", "Test E - Attempt to open nonexistant file", true);