Index: trunk/psLib/test/collections/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 3737)
+++ trunk/psLib/test/collections/tst_psMetadataIO.c	(revision 3779)
@@ -14,6 +14,6 @@
  *  @author  Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-04-28 02:45:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -121,5 +121,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Read config file with overwrite set false");
     psMetadata *metadata2 = NULL;
-    psS32 failedLines2 = 0;
+    psU32 failedLines2 = 0;
     metadata2 = psMetadataParseConfig(metadata2, &failedLines2, "test.config", false);
     printf("Failed lines: %d Expected: 7 ", failedLines2);
@@ -131,5 +131,5 @@
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read config file without auto-allocation of metadata");
     psMetadata *metadata3 = psMetadataAlloc();
-    psS32 failedLines3 = 0;
+    psU32 failedLines3 = 0;
     metadata3 = psMetadataParseConfig(metadata3, &failedLines3, "test.config", true);
     printf("Failed lines: %d Expected: 6 ", failedLines3);
Index: trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 3737)
+++ trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 3779)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.24 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-04-07 20:27:41 $
+*  @version $Revision: 1.25 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-04-28 02:45:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -126,6 +126,4 @@
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
 
-    printf("ID=%d\n",(int)psMemGetId());
-
     // Test B - Read 2nd hdr from complex FITS file
 
@@ -174,6 +172,4 @@
     printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
 
-    printf("ID=%d\n",(int)psMemGetId());
-
     // Test C - Read named hdr from complex FITS file
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file");
Index: trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout
===================================================================
--- trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout	(revision 3737)
+++ trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout	(revision 3779)
@@ -26,5 +26,5 @@
 
 Contents of metadata table:
- Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: 
+ Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: List of Metadata Items
     Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
     Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
@@ -73,5 +73,5 @@
 
 Contents of metadata table:
- Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: 
+ Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: List of Metadata Items
     Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
     Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
@@ -120,5 +120,5 @@
 
 Contents of metadata table:
- Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: 
+ Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: List of Metadata Items
     Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
     Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
Index: trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout
===================================================================
--- trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout	(revision 3737)
+++ trunk/psLib/test/collections/verified/tst_psMetadata_01.stdout	(revision 3779)
@@ -19,5 +19,4 @@
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
 
-ID=34
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
@@ -45,9 +44,9 @@
  Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
  Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+ Key Name:   BITPIX  Key mdType: 0x0001000a  Key Value:                  Key Comment: List of Metadata Items
     Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
     Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: List of Metadata Items
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
@@ -58,5 +57,4 @@
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
 
-ID=138
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
@@ -83,5 +81,5 @@
  Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
  Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: List of Metadata Items
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
     Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>