Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1494)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1495)
@@ -7,8 +7,15 @@
 FITS file open status: OK - no error
 
-Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
-Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
-Key Name:    NAXIS  Key Type:  2  Key Value:               0  Key Comment: number of data axes
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+Contents of metadata list:
+ Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key Type:  2  Key Value:               0  Key Comment: number of data axes
+ Key Name:  HISTORY  Key Type:  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 Type:  2  Key Value:               0  Key Comment: number of data axes
+ Key Name:   SIMPLE  Key Type:  1  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key Type:  2  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key Type:  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)
@@ -22,16 +29,33 @@
 FITS file open status: OK - no error
 
-Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
-Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
-Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
-Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
-Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
-Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+Contents of metadata list:
+ Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key Type:  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 Type:  2  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key Type:  0  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+    Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  HISTORY  Key Type:  0  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_1'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -45,13 +69,26 @@
 FITS file open status: OK - no error
 
-Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
-Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
-Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
-Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
-Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
-Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
-Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+Contents of metadata list:
+ Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key Type:  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 Type:  2  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key Type:  0  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key Type:  5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -59,5 +96,33 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test D - Attempt to use null file descriptor}   *
+*            TestPoint: psMetadata{Test D - Remove items with same name from all metadata} *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+Removed HISTORY from all metadata from prior test. Resulting metadata:
+
+Contents of metadata list:
+ Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key Type:  5  Key Value:     'MY_DATA_2'  Key Comment: 
+
+Contents of metadata table:
+ Key Name:    NAXIS  Key Type:  2  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key Type:  2  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key Type:  2  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key Type:  5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key Type:  2  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key Type:  2  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key Type:  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)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata{Test E - Attempt to use null file descriptor}   *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Null FITS file descriptor not allowed                      *
@@ -66,9 +131,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test D - Attempt to use null file descriptor} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test E - Attempt to use null file descriptor} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test E - Attempt to use two null inputs}        *
+*            TestPoint: psMetadata{Test F - Attempt to use two null inputs}        *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: Null extName and extNum = 0 not allowed                    *
@@ -77,9 +142,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test E - Attempt to use two null inputs} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test F - Attempt to use two null inputs} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test F - Attempt to use bad extNum}             *
+*            TestPoint: psMetadata{Test G - Attempt to use bad extNum}             *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: FITS error while locating header 22: tried to move past end of file *
@@ -88,9 +153,9 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test F - Attempt to use bad extNum} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test G - Attempt to use bad extNum} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test F - Attempt to use bad extName}            *
+*            TestPoint: psMetadata{Test H - Attempt to use bad extName}            *
 *             TestType: Negative                                                   *
 *    ExpectedErrorText: FITS error while locating header AARGH: illegal HDU number *
@@ -99,13 +164,13 @@
 
 
----> TESTPOINT PASSED (psMetadata{Test F - Attempt to use bad extName} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test H - Attempt to use bad extName} | tst_psMetadata_01.c)
 
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
-*            TestPoint: psMetadata{Test H - Free psMetadata}                       *
+*            TestPoint: psMetadata{Test I - Free psMetadata}                       *
 *             TestType: Positive                                                   *
 \**********************************************************************************/
 
 
----> TESTPOINT PASSED (psMetadata{Test H - Free psMetadata} | tst_psMetadata_01.c)
+---> TESTPOINT PASSED (psMetadata{Test I - Free psMetadata} | tst_psMetadata_01.c)